[asterisk-commits] branch oej/codecnegotiation r34104 - in /team/oej/codecnegotiation: ./ apps/ ...

asterisk-commits at lists.digium.com asterisk-commits at lists.digium.com
Wed Jun 14 08:02:10 MST 2006 

Author: oej
Date: Wed Jun 14 10:02:05 2006
New Revision: 34104

URL: http://svn.digium.com/view/asterisk?rev=34104&view=rev
Log:
Resolve conflicts, reset automerge

Added:
    team/oej/codecnegotiation/apps/app_followme.c
      - copied unchanged from r34090, trunk/apps/app_followme.c
    team/oej/codecnegotiation/configs/followme.conf.sample
      - copied unchanged from r34090, trunk/configs/followme.conf.sample
    team/oej/codecnegotiation/contrib/utils/zones2indications.c
      - copied unchanged from r34090, trunk/contrib/utils/zones2indications.c
    team/oej/codecnegotiation/include/asterisk/autoconfig.h.in
      - copied unchanged from r34090, trunk/include/asterisk/autoconfig.h.in
    team/oej/codecnegotiation/sounds/Makefile
      - copied unchanged from r34090, trunk/sounds/Makefile
    team/oej/codecnegotiation/sounds/sounds.xml
      - copied unchanged from r34090, trunk/sounds/sounds.xml
Removed:
    team/oej/codecnegotiation/include/autoconfig.h.in
    team/oej/codecnegotiation/sounds/agent-alreadyon.gsm
    team/oej/codecnegotiation/sounds/agent-incorrect.gsm
    team/oej/codecnegotiation/sounds/agent-loggedoff.gsm
    team/oej/codecnegotiation/sounds/agent-loginok.gsm
    team/oej/codecnegotiation/sounds/agent-newlocation.gsm
    team/oej/codecnegotiation/sounds/agent-pass.gsm
    team/oej/codecnegotiation/sounds/agent-user.gsm
    team/oej/codecnegotiation/sounds/auth-incorrect.gsm
    team/oej/codecnegotiation/sounds/auth-thankyou.gsm
    team/oej/codecnegotiation/sounds/beep.gsm
    team/oej/codecnegotiation/sounds/beeperr.gsm
    team/oej/codecnegotiation/sounds/conf-adminmenu.gsm
    team/oej/codecnegotiation/sounds/conf-enteringno.gsm
    team/oej/codecnegotiation/sounds/conf-errormenu.gsm
    team/oej/codecnegotiation/sounds/conf-getchannel.gsm
    team/oej/codecnegotiation/sounds/conf-getconfno.gsm
    team/oej/codecnegotiation/sounds/conf-getpin.gsm
    team/oej/codecnegotiation/sounds/conf-hasjoin.gsm
    team/oej/codecnegotiation/sounds/conf-hasleft.gsm
    team/oej/codecnegotiation/sounds/conf-invalid.gsm
    team/oej/codecnegotiation/sounds/conf-invalidpin.gsm
    team/oej/codecnegotiation/sounds/conf-kicked.gsm
    team/oej/codecnegotiation/sounds/conf-leaderhasleft.gsm
    team/oej/codecnegotiation/sounds/conf-locked.gsm
    team/oej/codecnegotiation/sounds/conf-lockednow.gsm
    team/oej/codecnegotiation/sounds/conf-muted.gsm
    team/oej/codecnegotiation/sounds/conf-noempty.gsm
    team/oej/codecnegotiation/sounds/conf-onlyone.gsm
    team/oej/codecnegotiation/sounds/conf-onlyperson.gsm
    team/oej/codecnegotiation/sounds/conf-otherinparty.gsm
    team/oej/codecnegotiation/sounds/conf-placeintoconf.gsm
    team/oej/codecnegotiation/sounds/conf-thereare.gsm
    team/oej/codecnegotiation/sounds/conf-unlockednow.gsm
    team/oej/codecnegotiation/sounds/conf-unmuted.gsm
    team/oej/codecnegotiation/sounds/conf-usermenu.gsm
    team/oej/codecnegotiation/sounds/conf-userswilljoin.gsm
    team/oej/codecnegotiation/sounds/conf-userwilljoin.gsm
    team/oej/codecnegotiation/sounds/conf-waitforleader.gsm
    team/oej/codecnegotiation/sounds/demo-abouttotry.gsm
    team/oej/codecnegotiation/sounds/demo-congrats.gsm
    team/oej/codecnegotiation/sounds/demo-echodone.gsm
    team/oej/codecnegotiation/sounds/demo-echotest.gsm
    team/oej/codecnegotiation/sounds/demo-enterkeywords.gsm
    team/oej/codecnegotiation/sounds/demo-instruct.gsm
    team/oej/codecnegotiation/sounds/demo-moreinfo.gsm
    team/oej/codecnegotiation/sounds/demo-nogo.gsm
    team/oej/codecnegotiation/sounds/demo-nomatch.gsm
    team/oej/codecnegotiation/sounds/demo-thanks.gsm
    team/oej/codecnegotiation/sounds/dictate/
    team/oej/codecnegotiation/sounds/digits/
    team/oej/codecnegotiation/sounds/dir-instr.gsm
    team/oej/codecnegotiation/sounds/dir-intro-fn.gsm
    team/oej/codecnegotiation/sounds/dir-intro.gsm
    team/oej/codecnegotiation/sounds/dir-nomatch.gsm
    team/oej/codecnegotiation/sounds/dir-nomore.gsm
    team/oej/codecnegotiation/sounds/fpm-calm-river.mp3
    team/oej/codecnegotiation/sounds/fpm-sunshine.mp3
    team/oej/codecnegotiation/sounds/fpm-world-mix.mp3
    team/oej/codecnegotiation/sounds/hello-world.gsm
    team/oej/codecnegotiation/sounds/hours.gsm
    team/oej/codecnegotiation/sounds/invalid.gsm
    team/oej/codecnegotiation/sounds/letters/
    team/oej/codecnegotiation/sounds/minutes.gsm
    team/oej/codecnegotiation/sounds/pbx-invalid.gsm
    team/oej/codecnegotiation/sounds/pbx-invalidpark.gsm
    team/oej/codecnegotiation/sounds/pbx-transfer.gsm
    team/oej/codecnegotiation/sounds/phonetic/
    team/oej/codecnegotiation/sounds/priv-callee-options.gsm
    team/oej/codecnegotiation/sounds/priv-callpending.gsm
    team/oej/codecnegotiation/sounds/priv-introsaved.gsm
    team/oej/codecnegotiation/sounds/priv-recordintro.gsm
    team/oej/codecnegotiation/sounds/privacy-incorrect.gsm
    team/oej/codecnegotiation/sounds/privacy-prompt.gsm
    team/oej/codecnegotiation/sounds/privacy-thankyou.gsm
    team/oej/codecnegotiation/sounds/privacy-unident.gsm
    team/oej/codecnegotiation/sounds/queue-callswaiting.gsm
    team/oej/codecnegotiation/sounds/queue-holdtime.gsm
    team/oej/codecnegotiation/sounds/queue-less-than.gsm
    team/oej/codecnegotiation/sounds/queue-minutes.gsm
    team/oej/codecnegotiation/sounds/queue-periodic-announce.gsm
    team/oej/codecnegotiation/sounds/queue-reporthold.gsm
    team/oej/codecnegotiation/sounds/queue-seconds.gsm
    team/oej/codecnegotiation/sounds/queue-thankyou.gsm
    team/oej/codecnegotiation/sounds/queue-thereare.gsm
    team/oej/codecnegotiation/sounds/queue-youarenext.gsm
    team/oej/codecnegotiation/sounds/screen-callee-options.gsm
    team/oej/codecnegotiation/sounds/seconds.gsm
    team/oej/codecnegotiation/sounds/spy-agent.gsm
    team/oej/codecnegotiation/sounds/spy-h323.gsm
    team/oej/codecnegotiation/sounds/spy-iax.gsm
    team/oej/codecnegotiation/sounds/spy-iax2.gsm
    team/oej/codecnegotiation/sounds/spy-mgcp.gsm
    team/oej/codecnegotiation/sounds/spy-sip.gsm
    team/oej/codecnegotiation/sounds/spy-skinny.gsm
    team/oej/codecnegotiation/sounds/spy-zap.gsm
    team/oej/codecnegotiation/sounds/ss-noservice.gsm
    team/oej/codecnegotiation/sounds/transfer.gsm
    team/oej/codecnegotiation/sounds/tt-allbusy.gsm
    team/oej/codecnegotiation/sounds/tt-monkeys.gsm
    team/oej/codecnegotiation/sounds/tt-monkeysintro.gsm
    team/oej/codecnegotiation/sounds/tt-somethingwrong.gsm
    team/oej/codecnegotiation/sounds/tt-weasels.gsm
    team/oej/codecnegotiation/sounds/vm-Cust1.gsm
    team/oej/codecnegotiation/sounds/vm-Cust2.gsm
    team/oej/codecnegotiation/sounds/vm-Cust3.gsm
    team/oej/codecnegotiation/sounds/vm-Cust4.gsm
    team/oej/codecnegotiation/sounds/vm-Cust5.gsm
    team/oej/codecnegotiation/sounds/vm-Family.gsm
    team/oej/codecnegotiation/sounds/vm-Friends.gsm
    team/oej/codecnegotiation/sounds/vm-INBOX.gsm
    team/oej/codecnegotiation/sounds/vm-Old.gsm
    team/oej/codecnegotiation/sounds/vm-Work.gsm
    team/oej/codecnegotiation/sounds/vm-advopts.gsm
    team/oej/codecnegotiation/sounds/vm-and.gsm
    team/oej/codecnegotiation/sounds/vm-calldiffnum.gsm
    team/oej/codecnegotiation/sounds/vm-changeto.gsm
    team/oej/codecnegotiation/sounds/vm-delete.gsm
    team/oej/codecnegotiation/sounds/vm-deleted.gsm
    team/oej/codecnegotiation/sounds/vm-dialout.gsm
    team/oej/codecnegotiation/sounds/vm-enter-num-to-call.gsm
    team/oej/codecnegotiation/sounds/vm-extension.gsm
    team/oej/codecnegotiation/sounds/vm-first.gsm
    team/oej/codecnegotiation/sounds/vm-for.gsm
    team/oej/codecnegotiation/sounds/vm-forward.gsm
    team/oej/codecnegotiation/sounds/vm-forwardoptions.gsm
    team/oej/codecnegotiation/sounds/vm-from-extension.gsm
    team/oej/codecnegotiation/sounds/vm-from-phonenumber.gsm
    team/oej/codecnegotiation/sounds/vm-from.gsm
    team/oej/codecnegotiation/sounds/vm-goodbye.gsm
    team/oej/codecnegotiation/sounds/vm-helpexit.gsm
    team/oej/codecnegotiation/sounds/vm-incorrect-mailbox.gsm
    team/oej/codecnegotiation/sounds/vm-incorrect.gsm
    team/oej/codecnegotiation/sounds/vm-instructions.gsm
    team/oej/codecnegotiation/sounds/vm-intro.gsm
    team/oej/codecnegotiation/sounds/vm-isonphone.gsm
    team/oej/codecnegotiation/sounds/vm-isunavail.gsm
    team/oej/codecnegotiation/sounds/vm-last.gsm
    team/oej/codecnegotiation/sounds/vm-leavemsg.gsm
    team/oej/codecnegotiation/sounds/vm-login.gsm
    team/oej/codecnegotiation/sounds/vm-mailboxfull.gsm
    team/oej/codecnegotiation/sounds/vm-message.gsm
    team/oej/codecnegotiation/sounds/vm-messages.gsm
    team/oej/codecnegotiation/sounds/vm-minutes.gsm
    team/oej/codecnegotiation/sounds/vm-mismatch.gsm
    team/oej/codecnegotiation/sounds/vm-msginstruct.gsm
    team/oej/codecnegotiation/sounds/vm-msgsaved.gsm
    team/oej/codecnegotiation/sounds/vm-newpassword.gsm
    team/oej/codecnegotiation/sounds/vm-newuser.gsm
    team/oej/codecnegotiation/sounds/vm-next.gsm
    team/oej/codecnegotiation/sounds/vm-no.gsm
    team/oej/codecnegotiation/sounds/vm-nobodyavail.gsm
    team/oej/codecnegotiation/sounds/vm-nobox.gsm
    team/oej/codecnegotiation/sounds/vm-nomore.gsm
    team/oej/codecnegotiation/sounds/vm-nonumber.gsm
    team/oej/codecnegotiation/sounds/vm-num-i-have.gsm
    team/oej/codecnegotiation/sounds/vm-onefor.gsm
    team/oej/codecnegotiation/sounds/vm-options.gsm
    team/oej/codecnegotiation/sounds/vm-opts.gsm
    team/oej/codecnegotiation/sounds/vm-passchanged.gsm
    team/oej/codecnegotiation/sounds/vm-password.gsm
    team/oej/codecnegotiation/sounds/vm-press.gsm
    team/oej/codecnegotiation/sounds/vm-prev.gsm
    team/oej/codecnegotiation/sounds/vm-reachoper.gsm
    team/oej/codecnegotiation/sounds/vm-rec-busy.gsm
    team/oej/codecnegotiation/sounds/vm-rec-name.gsm
    team/oej/codecnegotiation/sounds/vm-rec-temp.gsm
    team/oej/codecnegotiation/sounds/vm-rec-unv.gsm
    team/oej/codecnegotiation/sounds/vm-received.gsm
    team/oej/codecnegotiation/sounds/vm-reenterpassword.gsm
    team/oej/codecnegotiation/sounds/vm-repeat.gsm
    team/oej/codecnegotiation/sounds/vm-review.gsm
    team/oej/codecnegotiation/sounds/vm-saved.gsm
    team/oej/codecnegotiation/sounds/vm-savedto.gsm
    team/oej/codecnegotiation/sounds/vm-savefolder.gsm
    team/oej/codecnegotiation/sounds/vm-savemessage.gsm
    team/oej/codecnegotiation/sounds/vm-saveoper.gsm
    team/oej/codecnegotiation/sounds/vm-sorry.gsm
    team/oej/codecnegotiation/sounds/vm-star-cancel.gsm
    team/oej/codecnegotiation/sounds/vm-starmain.gsm
    team/oej/codecnegotiation/sounds/vm-tempgreetactive.gsm
    team/oej/codecnegotiation/sounds/vm-tempgreeting.gsm
    team/oej/codecnegotiation/sounds/vm-tempgreeting2.gsm
    team/oej/codecnegotiation/sounds/vm-tempremoved.gsm
    team/oej/codecnegotiation/sounds/vm-then-pound.gsm
    team/oej/codecnegotiation/sounds/vm-theperson.gsm
    team/oej/codecnegotiation/sounds/vm-tocallback.gsm
    team/oej/codecnegotiation/sounds/vm-tocallnum.gsm
    team/oej/codecnegotiation/sounds/vm-tocancel.gsm
    team/oej/codecnegotiation/sounds/vm-tocancelmsg.gsm
    team/oej/codecnegotiation/sounds/vm-toenternumber.gsm
    team/oej/codecnegotiation/sounds/vm-toforward.gsm
    team/oej/codecnegotiation/sounds/vm-tohearenv.gsm
    team/oej/codecnegotiation/sounds/vm-tomakecall.gsm
    team/oej/codecnegotiation/sounds/vm-tooshort.gsm
    team/oej/codecnegotiation/sounds/vm-toreply.gsm
    team/oej/codecnegotiation/sounds/vm-torerecord.gsm
    team/oej/codecnegotiation/sounds/vm-undelete.gsm
    team/oej/codecnegotiation/sounds/vm-undeleted.gsm
    team/oej/codecnegotiation/sounds/vm-unknown-caller.gsm
    team/oej/codecnegotiation/sounds/vm-whichbox.gsm
    team/oej/codecnegotiation/sounds/vm-youhave.gsm
Modified:
    team/oej/codecnegotiation/   (props changed)
    team/oej/codecnegotiation/CREDITS
    team/oej/codecnegotiation/Makefile
    team/oej/codecnegotiation/UPGRADE.txt
    team/oej/codecnegotiation/abstract_jb.c
    team/oej/codecnegotiation/acl.c
    team/oej/codecnegotiation/app.c
    team/oej/codecnegotiation/apps/Makefile
    team/oej/codecnegotiation/apps/app_adsiprog.c
    team/oej/codecnegotiation/apps/app_alarmreceiver.c
    team/oej/codecnegotiation/apps/app_amd.c
    team/oej/codecnegotiation/apps/app_authenticate.c
    team/oej/codecnegotiation/apps/app_cdr.c
    team/oej/codecnegotiation/apps/app_chanisavail.c
    team/oej/codecnegotiation/apps/app_channelredirect.c
    team/oej/codecnegotiation/apps/app_chanspy.c
    team/oej/codecnegotiation/apps/app_controlplayback.c
    team/oej/codecnegotiation/apps/app_db.c
    team/oej/codecnegotiation/apps/app_dial.c
    team/oej/codecnegotiation/apps/app_dictate.c
    team/oej/codecnegotiation/apps/app_directed_pickup.c
    team/oej/codecnegotiation/apps/app_directory.c
    team/oej/codecnegotiation/apps/app_disa.c
    team/oej/codecnegotiation/apps/app_dumpchan.c
    team/oej/codecnegotiation/apps/app_echo.c
    team/oej/codecnegotiation/apps/app_exec.c
    team/oej/codecnegotiation/apps/app_externalivr.c
    team/oej/codecnegotiation/apps/app_festival.c
    team/oej/codecnegotiation/apps/app_flash.c
    team/oej/codecnegotiation/apps/app_forkcdr.c
    team/oej/codecnegotiation/apps/app_getcpeid.c
    team/oej/codecnegotiation/apps/app_hasnewvoicemail.c
    team/oej/codecnegotiation/apps/app_ices.c
    team/oej/codecnegotiation/apps/app_image.c
    team/oej/codecnegotiation/apps/app_ivrdemo.c
    team/oej/codecnegotiation/apps/app_lookupblacklist.c
    team/oej/codecnegotiation/apps/app_lookupcidname.c
    team/oej/codecnegotiation/apps/app_macro.c
    team/oej/codecnegotiation/apps/app_meetme.c
    team/oej/codecnegotiation/apps/app_milliwatt.c
    team/oej/codecnegotiation/apps/app_mixmonitor.c
    team/oej/codecnegotiation/apps/app_morsecode.c
    team/oej/codecnegotiation/apps/app_mp3.c
    team/oej/codecnegotiation/apps/app_nbscat.c
    team/oej/codecnegotiation/apps/app_osplookup.c
    team/oej/codecnegotiation/apps/app_page.c
    team/oej/codecnegotiation/apps/app_parkandannounce.c
    team/oej/codecnegotiation/apps/app_playback.c
    team/oej/codecnegotiation/apps/app_privacy.c
    team/oej/codecnegotiation/apps/app_queue.c
    team/oej/codecnegotiation/apps/app_random.c
    team/oej/codecnegotiation/apps/app_read.c
    team/oej/codecnegotiation/apps/app_readfile.c
    team/oej/codecnegotiation/apps/app_realtime.c
    team/oej/codecnegotiation/apps/app_record.c
    team/oej/codecnegotiation/apps/app_rpt.c
    team/oej/codecnegotiation/apps/app_sayunixtime.c
    team/oej/codecnegotiation/apps/app_senddtmf.c
    team/oej/codecnegotiation/apps/app_sendtext.c
    team/oej/codecnegotiation/apps/app_setcallerid.c
    team/oej/codecnegotiation/apps/app_setcdruserfield.c
    team/oej/codecnegotiation/apps/app_settransfercapability.c
    team/oej/codecnegotiation/apps/app_skel.c
    team/oej/codecnegotiation/apps/app_sms.c
    team/oej/codecnegotiation/apps/app_softhangup.c
    team/oej/codecnegotiation/apps/app_speech_utils.c
    team/oej/codecnegotiation/apps/app_stack.c
    team/oej/codecnegotiation/apps/app_system.c
    team/oej/codecnegotiation/apps/app_talkdetect.c
    team/oej/codecnegotiation/apps/app_test.c
    team/oej/codecnegotiation/apps/app_transfer.c
    team/oej/codecnegotiation/apps/app_url.c
    team/oej/codecnegotiation/apps/app_userevent.c
    team/oej/codecnegotiation/apps/app_verbose.c
    team/oej/codecnegotiation/apps/app_voicemail.c
    team/oej/codecnegotiation/apps/app_waitforring.c
    team/oej/codecnegotiation/apps/app_waitforsilence.c
    team/oej/codecnegotiation/apps/app_while.c
    team/oej/codecnegotiation/apps/app_zapateller.c
    team/oej/codecnegotiation/apps/app_zapbarge.c
    team/oej/codecnegotiation/apps/app_zapras.c
    team/oej/codecnegotiation/apps/app_zapscan.c
    team/oej/codecnegotiation/ast_expr2.c
    team/oej/codecnegotiation/ast_expr2.fl
    team/oej/codecnegotiation/ast_expr2.y
    team/oej/codecnegotiation/ast_expr2f.c
    team/oej/codecnegotiation/asterisk.c
    team/oej/codecnegotiation/astmm.c
    team/oej/codecnegotiation/autoservice.c
    team/oej/codecnegotiation/build_tools/cflags.xml
    team/oej/codecnegotiation/build_tools/menuselect.c
    team/oej/codecnegotiation/build_tools/menuselect.h
    team/oej/codecnegotiation/build_tools/menuselect_curses.c
    team/oej/codecnegotiation/build_tools/prep_moduledeps
    team/oej/codecnegotiation/callerid.c
    team/oej/codecnegotiation/cdr.c
    team/oej/codecnegotiation/cdr/Makefile
    team/oej/codecnegotiation/cdr/cdr_csv.c
    team/oej/codecnegotiation/cdr/cdr_custom.c
    team/oej/codecnegotiation/cdr/cdr_manager.c
    team/oej/codecnegotiation/cdr/cdr_odbc.c
    team/oej/codecnegotiation/cdr/cdr_pgsql.c
    team/oej/codecnegotiation/cdr/cdr_radius.c
    team/oej/codecnegotiation/cdr/cdr_sqlite.c
    team/oej/codecnegotiation/cdr/cdr_tds.c
    team/oej/codecnegotiation/channel.c
    team/oej/codecnegotiation/channels/Makefile
    team/oej/codecnegotiation/channels/chan_agent.c
    team/oej/codecnegotiation/channels/chan_alsa.c
    team/oej/codecnegotiation/channels/chan_features.c
    team/oej/codecnegotiation/channels/chan_h323.c
    team/oej/codecnegotiation/channels/chan_iax2.c
    team/oej/codecnegotiation/channels/chan_jingle.c
    team/oej/codecnegotiation/channels/chan_local.c
    team/oej/codecnegotiation/channels/chan_mgcp.c
    team/oej/codecnegotiation/channels/chan_misdn.c
    team/oej/codecnegotiation/channels/chan_nbs.c
    team/oej/codecnegotiation/channels/chan_oss.c
    team/oej/codecnegotiation/channels/chan_phone.c
    team/oej/codecnegotiation/channels/chan_sip.c
    team/oej/codecnegotiation/channels/chan_skinny.c
    team/oej/codecnegotiation/channels/chan_vpb.c
    team/oej/codecnegotiation/channels/chan_zap.c
    team/oej/codecnegotiation/channels/iax2-parser.c
    team/oej/codecnegotiation/channels/iax2-provision.c
    team/oej/codecnegotiation/channels/misdn/isdn_lib.c
    team/oej/codecnegotiation/channels/misdn_config.c
    team/oej/codecnegotiation/chanvars.c
    team/oej/codecnegotiation/cli.c
    team/oej/codecnegotiation/codecs/Makefile
    team/oej/codecnegotiation/codecs/codec_a_mu.c
    team/oej/codecnegotiation/codecs/codec_adpcm.c
    team/oej/codecnegotiation/codecs/codec_alaw.c
    team/oej/codecnegotiation/codecs/codec_g723_1.c
    team/oej/codecnegotiation/codecs/codec_g726.c
    team/oej/codecnegotiation/codecs/codec_gsm.c
    team/oej/codecnegotiation/codecs/codec_ilbc.c
    team/oej/codecnegotiation/codecs/codec_lpc10.c
    team/oej/codecnegotiation/codecs/codec_speex.c
    team/oej/codecnegotiation/codecs/codec_ulaw.c
    team/oej/codecnegotiation/codecs/gsm/src/preprocess.c
    team/oej/codecnegotiation/codecs/lpc10/lpc10.h
    team/oej/codecnegotiation/codecs/lpc10/lpcini.c
    team/oej/codecnegotiation/config.c
    team/oej/codecnegotiation/configs/extensions.conf.sample
    team/oej/codecnegotiation/configs/indications.conf.sample
    team/oej/codecnegotiation/configs/jabber.conf.sample
    team/oej/codecnegotiation/configs/musiconhold.conf.sample
    team/oej/codecnegotiation/configs/rtp.conf.sample
    team/oej/codecnegotiation/configs/sip.conf.sample
    team/oej/codecnegotiation/configure
    team/oej/codecnegotiation/configure.ac
    team/oej/codecnegotiation/cryptostub.c
    team/oej/codecnegotiation/db.c
    team/oej/codecnegotiation/devicestate.c
    team/oej/codecnegotiation/dns.c
    team/oej/codecnegotiation/dnsmgr.c
    team/oej/codecnegotiation/doc/channelvariables.txt
    team/oej/codecnegotiation/doc/smdi.txt
    team/oej/codecnegotiation/dsp.c
    team/oej/codecnegotiation/enum.c
    team/oej/codecnegotiation/file.c
    team/oej/codecnegotiation/fixedjitterbuf.c
    team/oej/codecnegotiation/formats/Makefile
    team/oej/codecnegotiation/formats/format_g723.c
    team/oej/codecnegotiation/formats/format_g726.c
    team/oej/codecnegotiation/formats/format_g729.c
    team/oej/codecnegotiation/formats/format_gsm.c
    team/oej/codecnegotiation/formats/format_h263.c
    team/oej/codecnegotiation/formats/format_h264.c
    team/oej/codecnegotiation/formats/format_ilbc.c
    team/oej/codecnegotiation/formats/format_jpeg.c
    team/oej/codecnegotiation/formats/format_ogg_vorbis.c
    team/oej/codecnegotiation/formats/format_pcm.c
    team/oej/codecnegotiation/formats/format_sln.c
    team/oej/codecnegotiation/formats/format_vox.c
    team/oej/codecnegotiation/formats/format_wav.c
    team/oej/codecnegotiation/formats/format_wav_gsm.c
    team/oej/codecnegotiation/frame.c
    team/oej/codecnegotiation/fskmodem.c
    team/oej/codecnegotiation/funcs/Makefile
    team/oej/codecnegotiation/funcs/func_base64.c
    team/oej/codecnegotiation/funcs/func_callerid.c
    team/oej/codecnegotiation/funcs/func_cdr.c
    team/oej/codecnegotiation/funcs/func_channel.c
    team/oej/codecnegotiation/funcs/func_curl.c
    team/oej/codecnegotiation/funcs/func_cut.c
    team/oej/codecnegotiation/funcs/func_db.c
    team/oej/codecnegotiation/funcs/func_enum.c
    team/oej/codecnegotiation/funcs/func_env.c
    team/oej/codecnegotiation/funcs/func_global.c
    team/oej/codecnegotiation/funcs/func_groupcount.c
    team/oej/codecnegotiation/funcs/func_language.c
    team/oej/codecnegotiation/funcs/func_logic.c
    team/oej/codecnegotiation/funcs/func_math.c
    team/oej/codecnegotiation/funcs/func_md5.c
    team/oej/codecnegotiation/funcs/func_moh.c
    team/oej/codecnegotiation/funcs/func_odbc.c
    team/oej/codecnegotiation/funcs/func_rand.c
    team/oej/codecnegotiation/funcs/func_realtime.c
    team/oej/codecnegotiation/funcs/func_sha1.c
    team/oej/codecnegotiation/funcs/func_strings.c
    team/oej/codecnegotiation/funcs/func_timeout.c
    team/oej/codecnegotiation/funcs/func_uri.c
    team/oej/codecnegotiation/http.c
    team/oej/codecnegotiation/image.c
    team/oej/codecnegotiation/include/   (props changed)
    team/oej/codecnegotiation/include/asterisk/   (props changed)
    team/oej/codecnegotiation/include/asterisk.h
    team/oej/codecnegotiation/include/asterisk/abstract_jb.h
    team/oej/codecnegotiation/include/asterisk/alaw.h
    team/oej/codecnegotiation/include/asterisk/astmm.h
    team/oej/codecnegotiation/include/asterisk/callerid.h
    team/oej/codecnegotiation/include/asterisk/channel.h
    team/oej/codecnegotiation/include/asterisk/chanspy.h
    team/oej/codecnegotiation/include/asterisk/compat.h
    team/oej/codecnegotiation/include/asterisk/dnsmgr.h
    team/oej/codecnegotiation/include/asterisk/doxyref.h
    team/oej/codecnegotiation/include/asterisk/endian.h
    team/oej/codecnegotiation/include/asterisk/file.h
    team/oej/codecnegotiation/include/asterisk/frame.h
    team/oej/codecnegotiation/include/asterisk/jabber.h
    team/oej/codecnegotiation/include/asterisk/lock.h
    team/oej/codecnegotiation/include/asterisk/plc.h
    team/oej/codecnegotiation/include/asterisk/rtp.h
    team/oej/codecnegotiation/include/asterisk/stringfields.h
    team/oej/codecnegotiation/include/asterisk/translate.h
    team/oej/codecnegotiation/include/asterisk/udptl.h
    team/oej/codecnegotiation/include/asterisk/ulaw.h
    team/oej/codecnegotiation/indications.c
    team/oej/codecnegotiation/io.c
    team/oej/codecnegotiation/jitterbuf.c
    team/oej/codecnegotiation/loader.c
    team/oej/codecnegotiation/logger.c
    team/oej/codecnegotiation/manager.c
    team/oej/codecnegotiation/md5.c
    team/oej/codecnegotiation/netsock.c
    team/oej/codecnegotiation/pbx.c
    team/oej/codecnegotiation/pbx/Makefile
    team/oej/codecnegotiation/pbx/ael/ael.flex
    team/oej/codecnegotiation/pbx/ael/ael.tab.c
    team/oej/codecnegotiation/pbx/ael/ael.y
    team/oej/codecnegotiation/pbx/ael/ael_lex.c
    team/oej/codecnegotiation/pbx/dundi-parser.c
    team/oej/codecnegotiation/pbx/pbx_ael.c
    team/oej/codecnegotiation/pbx/pbx_config.c
    team/oej/codecnegotiation/pbx/pbx_dundi.c
    team/oej/codecnegotiation/pbx/pbx_gtkconsole.c
    team/oej/codecnegotiation/pbx/pbx_loopback.c
    team/oej/codecnegotiation/pbx/pbx_realtime.c
    team/oej/codecnegotiation/pbx/pbx_spool.c
    team/oej/codecnegotiation/plc.c
    team/oej/codecnegotiation/privacy.c
    team/oej/codecnegotiation/res/Makefile
    team/oej/codecnegotiation/res/res_adsi.c
    team/oej/codecnegotiation/res/res_agi.c
    team/oej/codecnegotiation/res/res_clioriginate.c
    team/oej/codecnegotiation/res/res_config_odbc.c
    team/oej/codecnegotiation/res/res_config_pgsql.c
    team/oej/codecnegotiation/res/res_convert.c
    team/oej/codecnegotiation/res/res_crypto.c
    team/oej/codecnegotiation/res/res_features.c
    team/oej/codecnegotiation/res/res_indications.c
    team/oej/codecnegotiation/res/res_jabber.c
    team/oej/codecnegotiation/res/res_monitor.c
    team/oej/codecnegotiation/res/res_musiconhold.c
    team/oej/codecnegotiation/res/res_odbc.c
    team/oej/codecnegotiation/res/res_osp.c
    team/oej/codecnegotiation/res/res_smdi.c
    team/oej/codecnegotiation/res/res_snmp.c
    team/oej/codecnegotiation/res/res_speech.c
    team/oej/codecnegotiation/res/snmp/agent.c
    team/oej/codecnegotiation/rtp.c
    team/oej/codecnegotiation/say.c
    team/oej/codecnegotiation/sched.c
    team/oej/codecnegotiation/slinfactory.c
    team/oej/codecnegotiation/sounds/   (props changed)
    team/oej/codecnegotiation/srv.c
    team/oej/codecnegotiation/stdtime/localtime.c
    team/oej/codecnegotiation/strcompat.c
    team/oej/codecnegotiation/tdd.c
    team/oej/codecnegotiation/term.c
    team/oej/codecnegotiation/translate.c
    team/oej/codecnegotiation/udptl.c
    team/oej/codecnegotiation/utils.c
    team/oej/codecnegotiation/utils/Makefile
    team/oej/codecnegotiation/utils/ael_main.c
    team/oej/codecnegotiation/utils/astman.c
    team/oej/codecnegotiation/utils/smsq.c

Propchange: team/oej/codecnegotiation/
------------------------------------------------------------------------------
Binary property 'branch-1.2-blocked' - no diff available.

Propchange: team/oej/codecnegotiation/
------------------------------------------------------------------------------
Binary property 'branch-1.2-merged' - no diff available.

Propchange: team/oej/codecnegotiation/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Jun 14 10:02:05 2006
@@ -1,1 +1,1 @@
-/trunk:1-31975
+/trunk:1-34091

Modified: team/oej/codecnegotiation/CREDITS
URL: http://svn.digium.com/view/asterisk/team/oej/codecnegotiation/CREDITS?rev=34104&r1=34103&r2=34104&view=diff
==============================================================================
--- team/oej/codecnegotiation/CREDITS (original)
+++ team/oej/codecnegotiation/CREDITS Wed Jun 14 10:02:05 2006
@@ -26,6 +26,12 @@
 === HARDWARE DONORS === 
 * Thanks to QuickNet Technologies for their donation of an Internet
 PhoneJack and Linejack card to the project.  (http://www.quicknet.net)
+
+* Thanks to VoipSupply for their donation of Sipura ATAs to the project for
+T.38 testing. (http://www.voipsupply.com)
+
+* Thanks to Grandstream for their donation of ATAs to the project for
+T.38 testing. (http://www.grandstream.com)
 
 === MISCELLANEOUS PATCHES ===
 Jim Dixon - Zapata Telephony and app_rpt
@@ -124,6 +130,8 @@
 
 John Martin, Aupix - Improved video support in the SIP channel
 
+Steve Underwood - Provided T.38 pass through support.
+
 === OTHER CONTRIBUTIONS ===
 John Todd - Monkey sounds and associated teletorture prompt
 Michael Jerris - bug marshaling

Modified: team/oej/codecnegotiation/Makefile
URL: http://svn.digium.com/view/asterisk/team/oej/codecnegotiation/Makefile?rev=34104&r1=34103&r2=34104&view=diff
==============================================================================
--- team/oej/codecnegotiation/Makefile (original)
+++ team/oej/codecnegotiation/Makefile Wed Jun 14 10:02:05 2006
@@ -13,6 +13,8 @@
 
 .EXPORT_ALL_VARIABLES:
 
+.PHONY: sounds
+
 # Create OPTIONS variable
 OPTIONS=
 
@@ -36,22 +38,6 @@
 
 # Remember the MAKELEVEL at the top
 MAKETOPLEVEL?=$(MAKELEVEL)
-
-ifeq ($(findstring dont-optimize,$(MAKECMDGOALS)),)
-# More GSM codec optimization
-# Uncomment to enable MMXTM optimizations for x86 architecture CPU's
-# which support MMX instructions.  This should be newer pentiums,
-# ppro's, etc, as well as the AMD K6 and K7.  
-#K6OPT  = -DK6OPT
-
-# Tell gcc to optimize the code
-OPTIMIZE+=-O6
-else
-  # Stack backtraces, while useful for debugging, are incompatible with optimizations
-  ifeq (${OSARCH},Linux)
-    CFLAGS+=-DSTACK_BACKTRACES
-  endif
-endif
 
 # Overwite config files on "make samples"
 OVERWRITE=y
@@ -143,9 +129,32 @@
   include makeopts
 endif
 
-TOPDIR_CFLAGS=-include include/autoconfig.h -Iinclude
-MOD_SUBDIR_CFLAGS=-include ../include/autoconfig.h -I../include -I..
-OTHER_SUBDIR_CFLAGS=-include ../include/autoconfig.h -I../include -I..
+TOPDIR_CFLAGS=-Iinclude
+MOD_SUBDIR_CFLAGS=-I../include -I..
+OTHER_SUBDIR_CFLAGS=-I../include -I..
+
+ifeq ($(findstring dont-optimize,$(MAKECMDGOALS)),)
+  ifeq ($(findstring DONT_OPTIMIZE,$(MENUSELECT_CFLAGS)),)
+# More GSM codec optimization
+# Uncomment to enable MMXTM optimizations for x86 architecture CPU's
+# which support MMX instructions.  This should be newer pentiums,
+# ppro's, etc, as well as the AMD K6 and K7.  
+#K6OPT  = -DK6OPT
+
+# Tell gcc to optimize the code
+OPTIMIZE+=-O6
+  else
+    # Stack backtraces, while useful for debugging, are incompatible with optimizations
+    ifeq (${OSARCH},Linux)
+      CFLAGS+=-DSTACK_BACKTRACES
+    endif
+  endif
+else
+  # Stack backtraces, while useful for debugging, are incompatible with optimizations
+  ifeq (${OSARCH},Linux)
+    CFLAGS+=-DSTACK_BACKTRACES
+  endif
+endif
 
 #   *CLI> show memory allocations [filename]
 #   *CLI> show memory summary [filename]
@@ -187,7 +196,6 @@
       endif
     endif
   endif
-  MPG123TARG=linux
 endif
 
 GREP=grep
@@ -230,12 +238,10 @@
   ifneq ($(wildcard $(CROSS_COMPILE_TARGET)/usr/local/include/spandsp),)
     ASTCFLAGS+=-I$(CROSS_COMPILE_TARGET)/usr/local/include/spandsp
   endif
-  MPG123TARG=freebsd
 endif # FreeBSD
 
 ifeq ($(OSARCH),NetBSD)
   AST_CFLAGS+=-pthread -I$(CROSS_COMPILE_TARGET)/usr/pkg/include
-  MPG123TARG=netbsd
 endif
 
 ifeq ($(OSARCH),OpenBSD)
@@ -503,19 +509,19 @@
 	rm -f include/asterisk/version.h
 	rm -f .tags-sources tags TAGS
 	@if [ -f editline/Makefile ]; then $(MAKE) -C editline distclean ; fi
-	@if [ -d mpg123-0.59r ]; then $(MAKE) -C mpg123-0.59r clean; fi
 	$(MAKE) -C db1-ast clean
 	$(MAKE) -C stdtime clean
 
 distclean: dist-clean
 
 dist-clean: clean
+	$(MAKE) -C mxml clean
+	$(MAKE) -C build_tools dist-clean
+	$(MAKE) -C sounds dist-clean
 	rm -f menuselect.makeopts makeopts makeopts.xml
 	rm -f config.log config.status
 	rm -f include/autoconfig.h
 	rm -f include/asterisk/buildopts.h
-	$(MAKE) -C mxml clean
-	$(MAKE) -C build_tools dist-clean
 
 datafiles: all
 	if [ x`$(ID) -un` = xroot ]; then sh build_tools/mkpkgconfig $(DESTDIR)/usr/lib/pkgconfig; fi
@@ -526,57 +532,12 @@
 	for x in static-http/*; do \
 		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/static-http ; \
 	done
-	mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/digits
-	mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/priv-callerintros
-	for x in sounds/digits/*.gsm; do \
-		if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
-			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds/digits ; \
-		else \
-			echo "No description for $$x"; \
-			exit 1; \
-		fi; \
-	done
-	mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/dictate
-	for x in sounds/dictate/*.gsm; do \
-		if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
-			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds/dictate ; \
-		else \
-			echo "No description for $$x"; \
-			exit 1; \
-		fi; \
-	done
-	mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/letters
-	for x in sounds/letters/*.gsm; do \
-		if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
-			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds/letters ; \
-		else \
-			echo "No description for $$x"; \
-			exit 1; \
-		fi; \
-	done
-	mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds/phonetic
-	for x in sounds/phonetic/*.gsm; do \
-		if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
-			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds/phonetic ; \
-		else \
-			echo "No description for $$x"; \
-			exit 1; \
-		fi; \
-	done
-	for x in sounds/demo-* sounds/vm-* sounds/transfer* sounds/pbx-* sounds/ss-* sounds/beep* sounds/dir-* sounds/conf-* sounds/agent-* sounds/invalid* sounds/tt-* sounds/auth-* sounds/privacy-* sounds/queue-* sounds/spy-* sounds/priv-* sounds/screen-* sounds/hello-*; do \
-		if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
-			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds ; \
-		else \
-			echo "No description for $$x"; \
-			exit 1; \
-		fi; \
-	done
-	mkdir -p $(DESTDIR)$(ASTDATADIR)/mohmp3
 	mkdir -p $(DESTDIR)$(ASTDATADIR)/images
 	for x in images/*.jpg; do \
 		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/images ; \
 	done
 	mkdir -p $(DESTDIR)$(AGI_DIR)
+	$(MAKE) -C sounds install
 
 update: 
 	@if [ -d .svn ]; then \
@@ -628,11 +589,11 @@
 		chmod 755 $(DESTDIR)$(ASTSBINDIR)/safe_asterisk;\
 	fi
 	$(INSTALL) -d $(DESTDIR)$(ASTHEADERDIR)
+	$(INSTALL) -m 644 include/asterisk.h $(DESTDIR)$(includedir)
 	$(INSTALL) -m 644 include/asterisk/*.h $(DESTDIR)$(ASTHEADERDIR)
 	if [ -n "$(OLDHEADERS)" ]; then \
 		rm -f $(addprefix $(DESTDIR)$(ASTHEADERDIR)/,$(OLDHEADERS)) ;\
 	fi
-	mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds
 	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-csv
 	mkdir -p $(DESTDIR)$(ASTLOGDIR)/cdr-custom
 	mkdir -p $(DESTDIR)$(ASTDATADIR)/keys
@@ -650,7 +611,6 @@
 	else \
 		echo "You need to do cvs update -d not just cvs update" ; \
 	fi 
-	if [ -f mpg123-0.59r/mpg123 ]; then $(MAKE) -C mpg123-0.59r install; fi
 
 install-subdirs:
 	@for x in $(SUBDIRS); do $(MAKE) -C $$x install || exit 1 ; done
@@ -754,20 +714,6 @@
 	else \
 		echo "Skipping asterisk.conf creation"; \
 	fi
-	mkdir -p $(DESTDIR)$(ASTDATADIR)/sounds ; \
-	for x in sounds/demo-*; do \
-		if $(GREP) -q "^%`basename $$x`%" sounds.txt; then \
-			$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/sounds ; \
-		else \
-			echo "No description for $$x"; \
-			exit 1; \
-		fi; \
-	done
-	mkdir -p $(DESTDIR)$(ASTDATADIR)/mohmp3 ; \
-	for x in sounds/*.mp3; do \
-		$(INSTALL) -m 644 $$x $(DESTDIR)$(ASTDATADIR)/mohmp3 ; \
-	done
-	rm -f $(DESTDIR)$(ASTDATADIR)/mohmp3/sample-hold.mp3
 	mkdir -p $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/INBOX
 	:> $(DESTDIR)$(ASTSPOOLDIR)/voicemail/default/1234/unavail.gsm
 	for x in vm-theperson digits/1 digits/2 digits/3 digits/4 vm-isunavail; do \
@@ -821,12 +767,6 @@
 progdocs:
 	(cat contrib/asterisk-ng-doxygen; echo "HAVE_DOT=$(HAVEDOT)"; \
 	echo "PROJECT_NUMBER=$(ASTERISKVERSION)") | doxygen - 
-
-mpg123:
-	@wget -V >/dev/null || (echo "You need wget" ; false )
-	[ -f mpg123-0.59r.tar.gz ] || wget http://www.mpg123.de/mpg123/mpg123-0.59r.tar.gz
-	[ -d mpg123-0.59r ] || tar xfz mpg123-0.59r.tar.gz
-	$(MAKE) -C mpg123-0.59r $(MPG123TARG)
 
 config:
 	@if [ "${OSARCH}" = "Linux" ]; then \
@@ -897,6 +837,9 @@
 %_env:
 	$(MAKE) -C $(shell echo $@ | sed "s/_env//g") env
 
+sounds:
+	$(MAKE) -C sounds all
+
 env:
 	env
 
@@ -916,10 +859,10 @@
 	rm -f $(DESTDIR)$(ASTSBINDIR)/astgenkey
 	rm -f $(DESTDIR)$(ASTSBINDIR)/autosupport
 	rm -rf $(DESTDIR)$(ASTHEADERDIR)
-	rm -rf $(DESTDIR)$(ASTDATADIR)/sounds
 	rm -rf $(DESTDIR)$(ASTDATADIR)/firmware
 	rm -rf $(DESTDIR)$(ASTMANDIR)/man8
 	for x in $(SUBDIRS); do $(MAKE) -C $$x uninstall || exit 1 ; done
+	$(MAKE) -C sounds uninstall
 
 uninstall: _uninstall
 	@echo " +--------- Asterisk Uninstall Complete -----+"  
@@ -953,6 +896,6 @@
 	@cd mxml && unset CFLAGS LIBS && test -f config.h || ./configure
 	$(MAKE) -C mxml libmxml.a
 
-makeopts.xml: $(foreach dir,$(MOD_SUBDIRS),$(dir)/*.c) build_tools/cflags.xml
+makeopts.xml: $(foreach dir,$(MOD_SUBDIRS),$(dir)/*.c) build_tools/cflags.xml sounds/sounds.xml
 	@echo "Generating list of available modules ..."
 	@build_tools/prep_moduledeps > $@

Modified: team/oej/codecnegotiation/UPGRADE.txt
URL: http://svn.digium.com/view/asterisk/team/oej/codecnegotiation/UPGRADE.txt?rev=34104&r1=34103&r2=34104&view=diff
==============================================================================
--- team/oej/codecnegotiation/UPGRADE.txt (original)
+++ team/oej/codecnegotiation/UPGRADE.txt Wed Jun 14 10:02:05 2006
@@ -42,6 +42,39 @@
 If you would like to save your choices and have them applied against all
 builds, the file can be copied to '~/.asterisk.makeopts' or 
 '/etc/asterisk.makeopts'.
+
+Sound (prompt) and Music On Hold files:
+
+Beginning with Asterisk 1.4, the sound files and music on hold files supplied for
+use with Asterisk have been replaced with new versions produced from high quality
+master recordings, and are available in three languages (English, French and
+Spanish) and in five formats (WAV (uncompressed), mu-Law, a-Law, GSM and G.729).
+In addition, the music on hold files provided by FreePlay Music are now available
+in the same five formats, but no longer available in MP3 format.
+
+The Asterisk 1.4 tarball packages will only include English prompts in GSM format,
+(as were supplied with previous releases) and the FreePlay MOH files in WAV format.
+All of the other variations can be installed by running 'make menuselect' and
+selecting the packages you wish to install; when you run 'make install', those
+packages will be downloaded and installed along with the standard files included
+in the tarball.
+
+If for some reason you expect to not have Internet access at the time you will be
+running 'make install', you can make your package selections using menuselect and
+then run 'make sounds' to download (only) the sound packages; this will leave the
+sound packages in the 'sounds' subdirectory to be used later during installation.
+
+WARNING: Asterisk 1.4 supports a new layout for sound files in multiple languages;
+instead of the alternate-language files being stored in subdirectories underneath
+the existing files (for French, that would be digits/fr, letters/fr, phonetic/fr,
+etc.) the new layout creates one directory under /var/lib/asterisk/sounds for the
+language itself, then places all the sound files for that language under that
+directory and its subdirectories. This is the layout that will be created if you
+select non-English languages to be installed via menuselect, HOWEVER Asterisk does
+not default to this layout and will not find the files in the places it expects them
+to be. If you wish to use this layout, make sure you put 'languageprefix=yes' in your
+/etc/asterisk/asterisk.conf file, so that Asterisk will know how the files were
+installed.
 
 PBX Core:
 
@@ -265,11 +298,3 @@
 	ASTETCDIR	/usr/local/etc/asterisk
 	ASTBINDIR	/usr/local/bin/asterisk
 	ASTSBINDIR	/usr/local/sbin/asterisk
-
-Sounds:
-
-* The phonetic sounds directory has been removed from the asterisk-sounds
-  package because they are now included directly in Asterisk.  However, it is
-  important to note that the phonetic sounds that existed in asterisk-sounds 
-  used a different naming convention than the sounds in Asterisk.  For example,
-  instead of alpha.gsm and bravo.gsm, Asterisk has a_p.gsm and b_p.gsm.

Modified: team/oej/codecnegotiation/abstract_jb.c
URL: http://svn.digium.com/view/asterisk/team/oej/codecnegotiation/abstract_jb.c?rev=34104&r1=34103&r2=34104&view=diff
==============================================================================
--- team/oej/codecnegotiation/abstract_jb.c (original)
+++ team/oej/codecnegotiation/abstract_jb.c Wed Jun 14 10:02:05 2006
@@ -5,8 +5,6 @@
  *
  * Contributors:
  * Slav Klenov <slav at securax.org>
- *
- * Copyright on this file is disclaimed to Digium for inclusion in Asterisk
  *
  * See http://www.asterisk.org for more information about
  * the Asterisk project. Please do not directly contact
@@ -17,6 +15,9 @@

[... 27087 lines stripped ...]

More information about the asterisk-commits mailing list