[svn-commits] oej: branch oej/manager-check-trunk r277487 - in /team/oej/manager-check-trun...

[SVN commits to the Digium repositories]

Author: oej
Date: Fri Jul 16 16:13:13 2010
New Revision: 277487

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=277487
Log:
Reset and resolve again

Added:
    team/oej/manager-check-trunk/README-SERIOUSLY.bestpractices.txt
      - copied unchanged from r277409, trunk/README-SERIOUSLY.bestpractices.txt
    team/oej/manager-check-trunk/apps/app_saycounted.c
      - copied unchanged from r277409, trunk/apps/app_saycounted.c
    team/oej/manager-check-trunk/apps/app_voicemail.exports.in
      - copied unchanged from r277409, trunk/apps/app_voicemail.exports.in
    team/oej/manager-check-trunk/build_tools/make_linker_version_script
      - copied unchanged from r277409, trunk/build_tools/make_linker_version_script
    team/oej/manager-check-trunk/build_tools/sha1sum-sh
      - copied unchanged from r277409, trunk/build_tools/sha1sum-sh
    team/oej/manager-check-trunk/channels/sig_ss7.c
      - copied unchanged from r277409, trunk/channels/sig_ss7.c
    team/oej/manager-check-trunk/channels/sig_ss7.h
      - copied unchanged from r277409, trunk/channels/sig_ss7.h
    team/oej/manager-check-trunk/channels/sip/   (props changed)
      - copied from r277409, trunk/channels/sip/
    team/oej/manager-check-trunk/channels/sip/config_parser.c
      - copied unchanged from r277409, trunk/channels/sip/config_parser.c
    team/oej/manager-check-trunk/channels/sip/dialplan_functions.c
      - copied unchanged from r277409, trunk/channels/sip/dialplan_functions.c
    team/oej/manager-check-trunk/channels/sip/include/
      - copied from r277409, trunk/channels/sip/include/
    team/oej/manager-check-trunk/channels/sip/include/config_parser.h
      - copied unchanged from r277409, trunk/channels/sip/include/config_parser.h
    team/oej/manager-check-trunk/channels/sip/include/dialog.h
      - copied unchanged from r277409, trunk/channels/sip/include/dialog.h
    team/oej/manager-check-trunk/channels/sip/include/dialplan_functions.h
      - copied unchanged from r277409, trunk/channels/sip/include/dialplan_functions.h
    team/oej/manager-check-trunk/channels/sip/include/globals.h
      - copied unchanged from r277409, trunk/channels/sip/include/globals.h
    team/oej/manager-check-trunk/channels/sip/include/reqresp_parser.h
      - copied unchanged from r277409, trunk/channels/sip/include/reqresp_parser.h
    team/oej/manager-check-trunk/channels/sip/include/sdp_crypto.h
      - copied unchanged from r277409, trunk/channels/sip/include/sdp_crypto.h
    team/oej/manager-check-trunk/channels/sip/include/sip.h
      - copied unchanged from r277409, trunk/channels/sip/include/sip.h
    team/oej/manager-check-trunk/channels/sip/include/sip_utils.h
      - copied unchanged from r277409, trunk/channels/sip/include/sip_utils.h
    team/oej/manager-check-trunk/channels/sip/include/srtp.h
      - copied unchanged from r277409, trunk/channels/sip/include/srtp.h
    team/oej/manager-check-trunk/channels/sip/reqresp_parser.c
      - copied unchanged from r277409, trunk/channels/sip/reqresp_parser.c
    team/oej/manager-check-trunk/channels/sip/sdp_crypto.c
      - copied unchanged from r277409, trunk/channels/sip/sdp_crypto.c
    team/oej/manager-check-trunk/channels/sip/srtp.c
      - copied unchanged from r277409, trunk/channels/sip/srtp.c
    team/oej/manager-check-trunk/configs/asterisk.conf.sample
      - copied unchanged from r277409, trunk/configs/asterisk.conf.sample
    team/oej/manager-check-trunk/configs/ccss.conf.sample
      - copied unchanged from r277409, trunk/configs/ccss.conf.sample
    team/oej/manager-check-trunk/configs/res_fax.conf.sample
      - copied unchanged from r277409, trunk/configs/res_fax.conf.sample
    team/oej/manager-check-trunk/contrib/init.d/etc_default_asterisk
      - copied unchanged from r277409, trunk/contrib/init.d/etc_default_asterisk
    team/oej/manager-check-trunk/contrib/init.d/org.asterisk.asterisk.plist
      - copied unchanged from r277409, trunk/contrib/init.d/org.asterisk.asterisk.plist
    team/oej/manager-check-trunk/contrib/realtime/
      - copied from r277409, trunk/contrib/realtime/
    team/oej/manager-check-trunk/contrib/realtime/mysql/
      - copied from r277409, trunk/contrib/realtime/mysql/
    team/oej/manager-check-trunk/contrib/realtime/mysql/iaxfriends.sql
      - copied unchanged from r277409, trunk/contrib/realtime/mysql/iaxfriends.sql
    team/oej/manager-check-trunk/contrib/realtime/mysql/meetme.sql
      - copied unchanged from r277409, trunk/contrib/realtime/mysql/meetme.sql
    team/oej/manager-check-trunk/contrib/realtime/mysql/sipfriends.sql
      - copied unchanged from r277409, trunk/contrib/realtime/mysql/sipfriends.sql
    team/oej/manager-check-trunk/contrib/realtime/mysql/voicemail.sql
      - copied unchanged from r277409, trunk/contrib/realtime/mysql/voicemail.sql
    team/oej/manager-check-trunk/contrib/realtime/oracle/
      - copied from r277409, trunk/contrib/realtime/oracle/
    team/oej/manager-check-trunk/contrib/realtime/postgresql/
      - copied from r277409, trunk/contrib/realtime/postgresql/
    team/oej/manager-check-trunk/contrib/realtime/postgresql/realtime.sql
      - copied unchanged from r277409, trunk/contrib/realtime/postgresql/realtime.sql
    team/oej/manager-check-trunk/contrib/realtime/sqlserver/
      - copied from r277409, trunk/contrib/realtime/sqlserver/
    team/oej/manager-check-trunk/contrib/scripts/voicemailpwcheck.py
      - copied unchanged from r277409, trunk/contrib/scripts/voicemailpwcheck.py
    team/oej/manager-check-trunk/doc/CCSS_architecture.pdf
      - copied unchanged from r277409, trunk/doc/CCSS_architecture.pdf
    team/oej/manager-check-trunk/doc/HOWTO_collect_debug_information.txt
      - copied unchanged from r277409, trunk/doc/HOWTO_collect_debug_information.txt
    team/oej/manager-check-trunk/doc/advice_of_charge.txt
      - copied unchanged from r277409, trunk/doc/advice_of_charge.txt
    team/oej/manager-check-trunk/doc/distributed_devstate-XMPP.txt
      - copied unchanged from r277409, trunk/doc/distributed_devstate-XMPP.txt
    team/oej/manager-check-trunk/doc/tex/ccss.tex
      - copied unchanged from r277409, trunk/doc/tex/ccss.tex
    team/oej/manager-check-trunk/doc/tex/chan-mobile.tex
      - copied unchanged from r277409, trunk/doc/tex/chan-mobile.tex
    team/oej/manager-check-trunk/doc/tex/plc.tex
      - copied unchanged from r277409, trunk/doc/tex/plc.tex
    team/oej/manager-check-trunk/doc/tex/secure-calls.tex
      - copied unchanged from r277409, trunk/doc/tex/secure-calls.tex
    team/oej/manager-check-trunk/formats/format_g719.c
      - copied unchanged from r277409, trunk/formats/format_g719.c
    team/oej/manager-check-trunk/funcs/func_callcompletion.c
      - copied unchanged from r277409, trunk/funcs/func_callcompletion.c
    team/oej/manager-check-trunk/funcs/func_pitchshift.c
      - copied unchanged from r277409, trunk/funcs/func_pitchshift.c
    team/oej/manager-check-trunk/funcs/func_srv.c
      - copied unchanged from r277409, trunk/funcs/func_srv.c
    team/oej/manager-check-trunk/include/asterisk/aoc.h
      - copied unchanged from r277409, trunk/include/asterisk/aoc.h
    team/oej/manager-check-trunk/include/asterisk/ccss.h
      - copied unchanged from r277409, trunk/include/asterisk/ccss.h
    team/oej/manager-check-trunk/include/asterisk/channelstate.h
      - copied unchanged from r277409, trunk/include/asterisk/channelstate.h
    team/oej/manager-check-trunk/include/asterisk/data.h
      - copied unchanged from r277409, trunk/include/asterisk/data.h
    team/oej/manager-check-trunk/include/asterisk/netsock2.h
      - copied unchanged from r277409, trunk/include/asterisk/netsock2.h
    team/oej/manager-check-trunk/include/asterisk/res_fax.h
      - copied unchanged from r277409, trunk/include/asterisk/res_fax.h
    team/oej/manager-check-trunk/include/asterisk/res_srtp.h
      - copied unchanged from r277409, trunk/include/asterisk/res_srtp.h
    team/oej/manager-check-trunk/main/aoc.c
      - copied unchanged from r277409, trunk/main/aoc.c
    team/oej/manager-check-trunk/main/asterisk.exports.in
      - copied unchanged from r277409, trunk/main/asterisk.exports.in
    team/oej/manager-check-trunk/main/ccss.c
      - copied unchanged from r277409, trunk/main/ccss.c
    team/oej/manager-check-trunk/main/data.c
      - copied unchanged from r277409, trunk/main/data.c
    team/oej/manager-check-trunk/main/lock.c
      - copied unchanged from r277409, trunk/main/lock.c
    team/oej/manager-check-trunk/main/netsock2.c
      - copied unchanged from r277409, trunk/main/netsock2.c
    team/oej/manager-check-trunk/res/res_adsi.exports.in
      - copied unchanged from r277409, trunk/res/res_adsi.exports.in
    team/oej/manager-check-trunk/res/res_ael_share.exports.in
      - copied unchanged from r277409, trunk/res/res_ael_share.exports.in
    team/oej/manager-check-trunk/res/res_agi.exports.in
      - copied unchanged from r277409, trunk/res/res_agi.exports.in
    team/oej/manager-check-trunk/res/res_calendar.exports.in
      - copied unchanged from r277409, trunk/res/res_calendar.exports.in
    team/oej/manager-check-trunk/res/res_calendar_ews.c
      - copied unchanged from r277409, trunk/res/res_calendar_ews.c
    team/oej/manager-check-trunk/res/res_crypto.exports.in
      - copied unchanged from r277409, trunk/res/res_crypto.exports.in
    team/oej/manager-check-trunk/res/res_fax.c
      - copied unchanged from r277409, trunk/res/res_fax.c
    team/oej/manager-check-trunk/res/res_fax.exports.in
      - copied unchanged from r277409, trunk/res/res_fax.exports.in
    team/oej/manager-check-trunk/res/res_fax_spandsp.c
      - copied unchanged from r277409, trunk/res/res_fax_spandsp.c
    team/oej/manager-check-trunk/res/res_features.exports.in
      - copied unchanged from r277409, trunk/res/res_features.exports.in
    team/oej/manager-check-trunk/res/res_jabber.exports.in
      - copied unchanged from r277409, trunk/res/res_jabber.exports.in
    team/oej/manager-check-trunk/res/res_monitor.exports.in
      - copied unchanged from r277409, trunk/res/res_monitor.exports.in
    team/oej/manager-check-trunk/res/res_odbc.exports.in
      - copied unchanged from r277409, trunk/res/res_odbc.exports.in
    team/oej/manager-check-trunk/res/res_pktccops.exports.in
      - copied unchanged from r277409, trunk/res/res_pktccops.exports.in
    team/oej/manager-check-trunk/res/res_smdi.exports.in
      - copied unchanged from r277409, trunk/res/res_smdi.exports.in
    team/oej/manager-check-trunk/res/res_speech.exports.in
      - copied unchanged from r277409, trunk/res/res_speech.exports.in
    team/oej/manager-check-trunk/res/res_srtp.c
      - copied unchanged from r277409, trunk/res/res_srtp.c
    team/oej/manager-check-trunk/res/res_srtp.exports.in
      - copied unchanged from r277409, trunk/res/res_srtp.exports.in
    team/oej/manager-check-trunk/res/res_timing_kqueue.c
      - copied unchanged from r277409, trunk/res/res_timing_kqueue.c
    team/oej/manager-check-trunk/tests/test_acl.c
      - copied unchanged from r277409, trunk/tests/test_acl.c
    team/oej/manager-check-trunk/tests/test_aoc.c
      - copied unchanged from r277409, trunk/tests/test_aoc.c
    team/oej/manager-check-trunk/tests/test_app.c
      - copied unchanged from r277409, trunk/tests/test_app.c
    team/oej/manager-check-trunk/tests/test_astobj2.c
      - copied unchanged from r277409, trunk/tests/test_astobj2.c
    team/oej/manager-check-trunk/tests/test_devicestate.c
      - copied unchanged from r277409, trunk/tests/test_devicestate.c
    team/oej/manager-check-trunk/tests/test_event.c
      - copied unchanged from r277409, trunk/tests/test_event.c
    team/oej/manager-check-trunk/tests/test_func_file.c
      - copied unchanged from r277409, trunk/tests/test_func_file.c
    team/oej/manager-check-trunk/tests/test_gosub.c
      - copied unchanged from r277409, trunk/tests/test_gosub.c
    team/oej/manager-check-trunk/tests/test_locale.c
      - copied unchanged from r277409, trunk/tests/test_locale.c
    team/oej/manager-check-trunk/tests/test_pbx.c
      - copied unchanged from r277409, trunk/tests/test_pbx.c
    team/oej/manager-check-trunk/tests/test_stringfields.c
      - copied unchanged from r277409, trunk/tests/test_stringfields.c
    team/oej/manager-check-trunk/tests/test_strings.c
      - copied unchanged from r277409, trunk/tests/test_strings.c
    team/oej/manager-check-trunk/tests/test_time.c
      - copied unchanged from r277409, trunk/tests/test_time.c
    team/oej/manager-check-trunk/tests/test_utils.c
      - copied unchanged from r277409, trunk/tests/test_utils.c
Removed:
    team/oej/manager-check-trunk/apps/app_voicemail.exports
    team/oej/manager-check-trunk/contrib/firmware/
    team/oej/manager-check-trunk/contrib/scripts/iax-friends.sql
    team/oej/manager-check-trunk/contrib/scripts/meetme.sql
    team/oej/manager-check-trunk/contrib/scripts/realtime_pgsql.sql
    team/oej/manager-check-trunk/contrib/scripts/sip-friends.sql
    team/oej/manager-check-trunk/contrib/scripts/vmdb.sql
    team/oej/manager-check-trunk/doc/tex/chan_mobile.tex
    team/oej/manager-check-trunk/funcs/func_connectedline.c
    team/oej/manager-check-trunk/funcs/func_redirecting.c
    team/oej/manager-check-trunk/main/adsistub.c
    team/oej/manager-check-trunk/main/asterisk.exports
    team/oej/manager-check-trunk/main/cryptostub.c
    team/oej/manager-check-trunk/pbx/pbx_gtkconsole.c
    team/oej/manager-check-trunk/res/res_adsi.exports
    team/oej/manager-check-trunk/res/res_ael_share.exports
    team/oej/manager-check-trunk/res/res_agi.exports
    team/oej/manager-check-trunk/res/res_calendar.exports
    team/oej/manager-check-trunk/res/res_features.exports
    team/oej/manager-check-trunk/res/res_jabber.exports
    team/oej/manager-check-trunk/res/res_monitor.exports
    team/oej/manager-check-trunk/res/res_odbc.exports
    team/oej/manager-check-trunk/res/res_smdi.exports
    team/oej/manager-check-trunk/res/res_speech.exports
Modified:
    team/oej/manager-check-trunk/   (props changed)
    team/oej/manager-check-trunk/.cleancount
    team/oej/manager-check-trunk/CHANGES
    team/oej/manager-check-trunk/CREDITS
    team/oej/manager-check-trunk/LICENSE
    team/oej/manager-check-trunk/Makefile
    team/oej/manager-check-trunk/Makefile.moddir_rules
    team/oej/manager-check-trunk/Makefile.rules
    team/oej/manager-check-trunk/UPGRADE-1.6.txt
    team/oej/manager-check-trunk/UPGRADE.txt
    team/oej/manager-check-trunk/addons/   (props changed)
    team/oej/manager-check-trunk/addons/Makefile
    team/oej/manager-check-trunk/addons/cdr_mysql.c
    team/oej/manager-check-trunk/addons/chan_mobile.c
    team/oej/manager-check-trunk/addons/chan_ooh323.c
    team/oej/manager-check-trunk/addons/chan_ooh323.h
    team/oej/manager-check-trunk/addons/mp3/common.c
    team/oej/manager-check-trunk/addons/mp3/decode_ntom.c
    team/oej/manager-check-trunk/addons/mp3/interface.c
    team/oej/manager-check-trunk/addons/mp3/layer3.c
    team/oej/manager-check-trunk/addons/ooh323c/src/   (props changed)
    team/oej/manager-check-trunk/addons/ooh323c/src/context.c
    team/oej/manager-check-trunk/addons/ooh323c/src/decode.c
    team/oej/manager-check-trunk/addons/ooh323c/src/dlist.c
    team/oej/manager-check-trunk/addons/ooh323c/src/encode.c
    team/oej/manager-check-trunk/addons/ooh323c/src/errmgmt.c
    team/oej/manager-check-trunk/addons/ooh323c/src/eventHandler.c
    team/oej/manager-check-trunk/addons/ooh323c/src/h323/   (props changed)
    team/oej/manager-check-trunk/addons/ooh323c/src/memheap.c
    team/oej/manager-check-trunk/addons/ooh323c/src/ooCalls.c
    team/oej/manager-check-trunk/addons/ooh323c/src/ooCalls.h
    team/oej/manager-check-trunk/addons/ooh323c/src/ooCapability.c
    team/oej/manager-check-trunk/addons/ooh323c/src/ooCmdChannel.c
    team/oej/manager-check-trunk/addons/ooh323c/src/ooGkClient.c
    team/oej/manager-check-trunk/addons/ooh323c/src/ooLogChan.c
    team/oej/manager-check-trunk/addons/ooh323c/src/ooSocket.c
    team/oej/manager-check-trunk/addons/ooh323c/src/ooSocket.h
    team/oej/manager-check-trunk/addons/ooh323c/src/ooStackCmds.c
    team/oej/manager-check-trunk/addons/ooh323c/src/ooStackCmds.h
    team/oej/manager-check-trunk/addons/ooh323c/src/ooTimer.c
    team/oej/manager-check-trunk/addons/ooh323c/src/ooUtils.c
    team/oej/manager-check-trunk/addons/ooh323c/src/ooasn1.h
    team/oej/manager-check-trunk/addons/ooh323c/src/oochannels.c
    team/oej/manager-check-trunk/addons/ooh323c/src/ooh245.c
    team/oej/manager-check-trunk/addons/ooh323c/src/ooh245.h
    team/oej/manager-check-trunk/addons/ooh323c/src/ooh323.c
    team/oej/manager-check-trunk/addons/ooh323c/src/ooh323.h
    team/oej/manager-check-trunk/addons/ooh323c/src/ooh323ep.c
    team/oej/manager-check-trunk/addons/ooh323c/src/ooports.c
    team/oej/manager-check-trunk/addons/ooh323c/src/ooq931.c
    team/oej/manager-check-trunk/addons/ooh323c/src/ootrace.c
    team/oej/manager-check-trunk/addons/ooh323c/src/ootypes.h
    team/oej/manager-check-trunk/addons/ooh323c/src/perutil.c
    team/oej/manager-check-trunk/addons/ooh323c/src/printHandler.c
    team/oej/manager-check-trunk/addons/ooh323c/src/rtctype.c
    team/oej/manager-check-trunk/addons/ooh323cDriver.c
    team/oej/manager-check-trunk/addons/ooh323cDriver.h
    team/oej/manager-check-trunk/apps/   (props changed)
    team/oej/manager-check-trunk/apps/app_alarmreceiver.c
    team/oej/manager-check-trunk/apps/app_amd.c
    team/oej/manager-check-trunk/apps/app_confbridge.c
    team/oej/manager-check-trunk/apps/app_dial.c
    team/oej/manager-check-trunk/apps/app_directed_pickup.c
    team/oej/manager-check-trunk/apps/app_directory.c
    team/oej/manager-check-trunk/apps/app_disa.c
    team/oej/manager-check-trunk/apps/app_dumpchan.c
    team/oej/manager-check-trunk/apps/app_exec.c
    team/oej/manager-check-trunk/apps/app_externalivr.c
    team/oej/manager-check-trunk/apps/app_fax.c
    team/oej/manager-check-trunk/apps/app_followme.c
    team/oej/manager-check-trunk/apps/app_macro.c
    team/oej/manager-check-trunk/apps/app_meetme.c
    team/oej/manager-check-trunk/apps/app_minivm.c
    team/oej/manager-check-trunk/apps/app_mixmonitor.c
    team/oej/manager-check-trunk/apps/app_osplookup.c
    team/oej/manager-check-trunk/apps/app_parkandannounce.c
    team/oej/manager-check-trunk/apps/app_privacy.c
    team/oej/manager-check-trunk/apps/app_queue.c
    team/oej/manager-check-trunk/apps/app_readexten.c
    team/oej/manager-check-trunk/apps/app_record.c
    team/oej/manager-check-trunk/apps/app_rpt.c
    team/oej/manager-check-trunk/apps/app_senddtmf.c
    team/oej/manager-check-trunk/apps/app_setcallerid.c
    team/oej/manager-check-trunk/apps/app_sms.c
    team/oej/manager-check-trunk/apps/app_speech_utils.c
    team/oej/manager-check-trunk/apps/app_stack.c
    team/oej/manager-check-trunk/apps/app_system.c
    team/oej/manager-check-trunk/apps/app_talkdetect.c
    team/oej/manager-check-trunk/apps/app_userevent.c
    team/oej/manager-check-trunk/apps/app_voicemail.c
    team/oej/manager-check-trunk/apps/app_while.c
    team/oej/manager-check-trunk/apps/app_zapateller.c
    team/oej/manager-check-trunk/autoconf/ast_c_compile_check.m4
    team/oej/manager-check-trunk/autoconf/ast_c_define_check.m4
    team/oej/manager-check-trunk/autoconf/ast_check_pwlib.m4
    team/oej/manager-check-trunk/autoconf/ast_ext_lib.m4
    team/oej/manager-check-trunk/autoconf/ast_ext_tool_check.m4
    team/oej/manager-check-trunk/autoconf/ast_gcc_attribute.m4
    team/oej/manager-check-trunk/autoconf/libcurl.m4
    team/oej/manager-check-trunk/bootstrap.sh
    team/oej/manager-check-trunk/bridges/   (props changed)
    team/oej/manager-check-trunk/bridges/bridge_softmix.c
    team/oej/manager-check-trunk/build_tools/cflags.xml
    team/oej/manager-check-trunk/build_tools/make_build_h
    team/oej/manager-check-trunk/build_tools/menuselect-deps.in
    team/oej/manager-check-trunk/build_tools/prep_tarball
    team/oej/manager-check-trunk/cdr/   (props changed)
    team/oej/manager-check-trunk/cdr/cdr_adaptive_odbc.c
    team/oej/manager-check-trunk/cdr/cdr_csv.c
    team/oej/manager-check-trunk/cdr/cdr_custom.c
    team/oej/manager-check-trunk/cdr/cdr_manager.c
    team/oej/manager-check-trunk/cdr/cdr_odbc.c
    team/oej/manager-check-trunk/cdr/cdr_pgsql.c
    team/oej/manager-check-trunk/cdr/cdr_radius.c
    team/oej/manager-check-trunk/cdr/cdr_sqlite.c
    team/oej/manager-check-trunk/cdr/cdr_sqlite3_custom.c
    team/oej/manager-check-trunk/cdr/cdr_syslog.c
    team/oej/manager-check-trunk/cdr/cdr_tds.c
    team/oej/manager-check-trunk/cel/   (props changed)
    team/oej/manager-check-trunk/cel/cel_pgsql.c
    team/oej/manager-check-trunk/cel/cel_sqlite3_custom.c
    team/oej/manager-check-trunk/channels/   (props changed)
    team/oej/manager-check-trunk/channels/Makefile
    team/oej/manager-check-trunk/channels/chan_agent.c
    team/oej/manager-check-trunk/channels/chan_alsa.c
    team/oej/manager-check-trunk/channels/chan_console.c
    team/oej/manager-check-trunk/channels/chan_dahdi.c
    team/oej/manager-check-trunk/channels/chan_gtalk.c
    team/oej/manager-check-trunk/channels/chan_h323.c
    team/oej/manager-check-trunk/channels/chan_iax2.c
    team/oej/manager-check-trunk/channels/chan_jingle.c
    team/oej/manager-check-trunk/channels/chan_local.c
    team/oej/manager-check-trunk/channels/chan_mgcp.c
    team/oej/manager-check-trunk/channels/chan_misdn.c
    team/oej/manager-check-trunk/channels/chan_multicast_rtp.c
    team/oej/manager-check-trunk/channels/chan_oss.c
    team/oej/manager-check-trunk/channels/chan_phone.c
    team/oej/manager-check-trunk/channels/chan_sip.c
    team/oej/manager-check-trunk/channels/chan_skinny.c
    team/oej/manager-check-trunk/channels/chan_unistim.c
    team/oej/manager-check-trunk/channels/chan_usbradio.c
    team/oej/manager-check-trunk/channels/chan_vpb.cc
    team/oej/manager-check-trunk/channels/h323/Makefile.in
    team/oej/manager-check-trunk/channels/h323/ast_h323.cxx
    team/oej/manager-check-trunk/channels/iax2-parser.c
    team/oej/manager-check-trunk/channels/misdn/chan_misdn_config.h
    team/oej/manager-check-trunk/channels/misdn/isdn_lib.h
    team/oej/manager-check-trunk/channels/misdn_config.c
    team/oej/manager-check-trunk/channels/sig_analog.c
    team/oej/manager-check-trunk/channels/sig_analog.h
    team/oej/manager-check-trunk/channels/sig_pri.c
    team/oej/manager-check-trunk/channels/sig_pri.h
    team/oej/manager-check-trunk/codecs/   (props changed)
    team/oej/manager-check-trunk/codecs/Makefile
    team/oej/manager-check-trunk/codecs/codec_adpcm.c
    team/oej/manager-check-trunk/codecs/codec_alaw.c
    team/oej/manager-check-trunk/codecs/codec_dahdi.c
    team/oej/manager-check-trunk/codecs/codec_g722.c
    team/oej/manager-check-trunk/codecs/codec_g726.c
    team/oej/manager-check-trunk/codecs/codec_gsm.c
    team/oej/manager-check-trunk/codecs/codec_lpc10.c
    team/oej/manager-check-trunk/codecs/codec_speex.c
    team/oej/manager-check-trunk/codecs/codec_ulaw.c
    team/oej/manager-check-trunk/codecs/ex_speex.h
    team/oej/manager-check-trunk/codecs/gsm/Makefile
    team/oej/manager-check-trunk/config.guess
    team/oej/manager-check-trunk/configs/alsa.conf.sample
    team/oej/manager-check-trunk/configs/calendar.conf.sample
    team/oej/manager-check-trunk/configs/cdr.conf.sample
    team/oej/manager-check-trunk/configs/cdr_custom.conf.sample
    team/oej/manager-check-trunk/configs/cdr_odbc.conf.sample
    team/oej/manager-check-trunk/configs/cdr_sqlite3_custom.conf.sample
    team/oej/manager-check-trunk/configs/cdr_syslog.conf.sample
    team/oej/manager-check-trunk/configs/cdr_tds.conf.sample
    team/oej/manager-check-trunk/configs/chan_dahdi.conf.sample
    team/oej/manager-check-trunk/configs/chan_ooh323.conf.sample
    team/oej/manager-check-trunk/configs/cli_aliases.conf.sample
    team/oej/manager-check-trunk/configs/console.conf.sample
    team/oej/manager-check-trunk/configs/dbsep.conf.sample
    team/oej/manager-check-trunk/configs/dundi.conf.sample
    team/oej/manager-check-trunk/configs/extensions.ael.sample
    team/oej/manager-check-trunk/configs/extensions.conf.sample
    team/oej/manager-check-trunk/configs/features.conf.sample
    team/oej/manager-check-trunk/configs/indications.conf.sample
    team/oej/manager-check-trunk/configs/jabber.conf.sample
    team/oej/manager-check-trunk/configs/logger.conf.sample
    team/oej/manager-check-trunk/configs/manager.conf.sample
    team/oej/manager-check-trunk/configs/mgcp.conf.sample
    team/oej/manager-check-trunk/configs/misdn.conf.sample
    team/oej/manager-check-trunk/configs/osp.conf.sample
    team/oej/manager-check-trunk/configs/oss.conf.sample
    team/oej/manager-check-trunk/configs/queues.conf.sample
    team/oej/manager-check-trunk/configs/res_pgsql.conf.sample
    team/oej/manager-check-trunk/configs/say.conf.sample
    team/oej/manager-check-trunk/configs/sip.conf.sample
    team/oej/manager-check-trunk/configs/unistim.conf.sample
    team/oej/manager-check-trunk/configs/usbradio.conf.sample
    team/oej/manager-check-trunk/configs/voicemail.conf.sample
    team/oej/manager-check-trunk/configure
    team/oej/manager-check-trunk/configure.ac
    team/oej/manager-check-trunk/contrib/editors/asterisk.vim
    team/oej/manager-check-trunk/contrib/init.d/rc.debian.asterisk
    team/oej/manager-check-trunk/contrib/init.d/rc.redhat.asterisk
    team/oej/manager-check-trunk/contrib/scripts/astgenkey.8
    team/oej/manager-check-trunk/contrib/scripts/autosupport.8
    team/oej/manager-check-trunk/contrib/scripts/dbsep.cgi
    team/oej/manager-check-trunk/contrib/scripts/install_prereq
    team/oej/manager-check-trunk/contrib/scripts/live_ast
    team/oej/manager-check-trunk/contrib/scripts/safe_asterisk.8
    team/oej/manager-check-trunk/contrib/valgrind.supp
    team/oej/manager-check-trunk/doc/asterisk.8
    team/oej/manager-check-trunk/doc/backtrace.txt
    team/oej/manager-check-trunk/doc/manager_1_1.txt
    team/oej/manager-check-trunk/doc/osp.txt
    team/oej/manager-check-trunk/doc/tex/   (props changed)
    team/oej/manager-check-trunk/doc/tex/Makefile
    team/oej/manager-check-trunk/doc/tex/ael.tex
    team/oej/manager-check-trunk/doc/tex/asterisk.tex
    team/oej/manager-check-trunk/doc/tex/cdrdriver.tex
    team/oej/manager-check-trunk/doc/tex/cel-doc.tex
    team/oej/manager-check-trunk/doc/tex/celdriver.tex
    team/oej/manager-check-trunk/doc/tex/channelvariables.tex
    team/oej/manager-check-trunk/doc/tex/configuration.tex
    team/oej/manager-check-trunk/doc/tex/enum.tex
    team/oej/manager-check-trunk/doc/tex/imapstorage.tex
    team/oej/manager-check-trunk/doc/tex/localchannel.tex
    team/oej/manager-check-trunk/doc/tex/manager.tex
    team/oej/manager-check-trunk/doc/tex/phoneprov.tex
    team/oej/manager-check-trunk/doc/tex/security-events.tex
    team/oej/manager-check-trunk/doc/voicemail_odbc_postgresql.txt
    team/oej/manager-check-trunk/formats/   (props changed)
    team/oej/manager-check-trunk/formats/format_pcm.c
    team/oej/manager-check-trunk/funcs/   (props changed)
    team/oej/manager-check-trunk/funcs/func_aes.c
    team/oej/manager-check-trunk/funcs/func_blacklist.c
    team/oej/manager-check-trunk/funcs/func_callerid.c
    team/oej/manager-check-trunk/funcs/func_cdr.c
    team/oej/manager-check-trunk/funcs/func_channel.c
    team/oej/manager-check-trunk/funcs/func_dialplan.c
    team/oej/manager-check-trunk/funcs/func_env.c
    team/oej/manager-check-trunk/funcs/func_groupcount.c
    team/oej/manager-check-trunk/funcs/func_math.c
    team/oej/manager-check-trunk/funcs/func_odbc.c
    team/oej/manager-check-trunk/funcs/func_strings.c
    team/oej/manager-check-trunk/include/asterisk/_private.h
    team/oej/manager-check-trunk/include/asterisk/abstract_jb.h
    team/oej/manager-check-trunk/include/asterisk/acl.h
    team/oej/manager-check-trunk/include/asterisk/adsi.h
    team/oej/manager-check-trunk/include/asterisk/agi.h
    team/oej/manager-check-trunk/include/asterisk/app.h
    team/oej/manager-check-trunk/include/asterisk/astmm.h
    team/oej/manager-check-trunk/include/asterisk/astobj2.h
    team/oej/manager-check-trunk/include/asterisk/audiohook.h
    team/oej/manager-check-trunk/include/asterisk/autoconfig.h.in
    team/oej/manager-check-trunk/include/asterisk/bridging_technology.h
    team/oej/manager-check-trunk/include/asterisk/calendar.h
    team/oej/manager-check-trunk/include/asterisk/callerid.h
    team/oej/manager-check-trunk/include/asterisk/causes.h
    team/oej/manager-check-trunk/include/asterisk/cdr.h
    team/oej/manager-check-trunk/include/asterisk/channel.h
    team/oej/manager-check-trunk/include/asterisk/cli.h
    team/oej/manager-check-trunk/include/asterisk/compat.h
    team/oej/manager-check-trunk/include/asterisk/config.h
    team/oej/manager-check-trunk/include/asterisk/crypto.h
    team/oej/manager-check-trunk/include/asterisk/devicestate.h
    team/oej/manager-check-trunk/include/asterisk/dnsmgr.h
    team/oej/manager-check-trunk/include/asterisk/doxygen/mantisworkflow.h
    team/oej/manager-check-trunk/include/asterisk/doxyref.h
    team/oej/manager-check-trunk/include/asterisk/event.h
    team/oej/manager-check-trunk/include/asterisk/extconf.h
    team/oej/manager-check-trunk/include/asterisk/features.h
    team/oej/manager-check-trunk/include/asterisk/file.h
    team/oej/manager-check-trunk/include/asterisk/frame.h
    team/oej/manager-check-trunk/include/asterisk/global_datastores.h
    team/oej/manager-check-trunk/include/asterisk/heap.h
    team/oej/manager-check-trunk/include/asterisk/http.h
    team/oej/manager-check-trunk/include/asterisk/indications.h
    team/oej/manager-check-trunk/include/asterisk/jabber.h
    team/oej/manager-check-trunk/include/asterisk/localtime.h
    team/oej/manager-check-trunk/include/asterisk/lock.h
    team/oej/manager-check-trunk/include/asterisk/logger.h
    team/oej/manager-check-trunk/include/asterisk/manager.h
    team/oej/manager-check-trunk/include/asterisk/optional_api.h
    team/oej/manager-check-trunk/include/asterisk/options.h
    team/oej/manager-check-trunk/include/asterisk/pbx.h
    team/oej/manager-check-trunk/include/asterisk/pval.h
    team/oej/manager-check-trunk/include/asterisk/res_odbc.h
    team/oej/manager-check-trunk/include/asterisk/rtp_engine.h
    team/oej/manager-check-trunk/include/asterisk/slin.h
    team/oej/manager-check-trunk/include/asterisk/smdi.h
    team/oej/manager-check-trunk/include/asterisk/srv.h
    team/oej/manager-check-trunk/include/asterisk/strings.h
    team/oej/manager-check-trunk/include/asterisk/taskprocessor.h
    team/oej/manager-check-trunk/include/asterisk/tcptls.h
    team/oej/manager-check-trunk/include/asterisk/term.h
    team/oej/manager-check-trunk/include/asterisk/test.h
    team/oej/manager-check-trunk/include/asterisk/threadstorage.h
    team/oej/manager-check-trunk/include/asterisk/timing.h
    team/oej/manager-check-trunk/include/asterisk/translate.h
    team/oej/manager-check-trunk/include/asterisk/udptl.h
    team/oej/manager-check-trunk/include/asterisk/utils.h
    team/oej/manager-check-trunk/include/asterisk/xml.h
    team/oej/manager-check-trunk/main/   (props changed)
    team/oej/manager-check-trunk/main/Makefile
    team/oej/manager-check-trunk/main/abstract_jb.c
    team/oej/manager-check-trunk/main/acl.c
    team/oej/manager-check-trunk/main/app.c
    team/oej/manager-check-trunk/main/ast_expr2.fl
    team/oej/manager-check-trunk/main/ast_expr2.y
    team/oej/manager-check-trunk/main/ast_expr2f.c
    team/oej/manager-check-trunk/main/asterisk.c
    team/oej/manager-check-trunk/main/asterisk.dynamics
    team/oej/manager-check-trunk/main/astobj2.c
    team/oej/manager-check-trunk/main/audiohook.c
    team/oej/manager-check-trunk/main/autoservice.c
    team/oej/manager-check-trunk/main/bridging.c
    team/oej/manager-check-trunk/main/callerid.c
    team/oej/manager-check-trunk/main/cdr.c
    team/oej/manager-check-trunk/main/cel.c
    team/oej/manager-check-trunk/main/channel.c
    team/oej/manager-check-trunk/main/cli.c
    team/oej/manager-check-trunk/main/config.c
    team/oej/manager-check-trunk/main/datastore.c
    team/oej/manager-check-trunk/main/db.c
    team/oej/manager-check-trunk/main/devicestate.c
    team/oej/manager-check-trunk/main/dial.c
    team/oej/manager-check-trunk/main/dnsmgr.c
    team/oej/manager-check-trunk/main/dsp.c
    team/oej/manager-check-trunk/main/editline/Makefile.in
    team/oej/manager-check-trunk/main/editline/configure
    team/oej/manager-check-trunk/main/editline/configure.in
    team/oej/manager-check-trunk/main/editline/sys.h
    team/oej/manager-check-trunk/main/event.c
    team/oej/manager-check-trunk/main/features.c
    team/oej/manager-check-trunk/main/file.c
    team/oej/manager-check-trunk/main/fixedjitterbuf.c
    team/oej/manager-check-trunk/main/frame.c
    team/oej/manager-check-trunk/main/global_datastores.c
    team/oej/manager-check-trunk/main/heap.c
    team/oej/manager-check-trunk/main/http.c
    team/oej/manager-check-trunk/main/indications.c
    team/oej/manager-check-trunk/main/loader.c
    team/oej/manager-check-trunk/main/logger.c
    team/oej/manager-check-trunk/main/manager.c
    team/oej/manager-check-trunk/main/pbx.c
    team/oej/manager-check-trunk/main/rtp_engine.c
    team/oej/manager-check-trunk/main/say.c
    team/oej/manager-check-trunk/main/sched.c
    team/oej/manager-check-trunk/main/srv.c
    team/oej/manager-check-trunk/main/stdtime/localtime.c
    team/oej/manager-check-trunk/main/strcompat.c
    team/oej/manager-check-trunk/main/strings.c
    team/oej/manager-check-trunk/main/taskprocessor.c
    team/oej/manager-check-trunk/main/tcptls.c
    team/oej/manager-check-trunk/main/term.c
    team/oej/manager-check-trunk/main/test.c
    team/oej/manager-check-trunk/main/translate.c
    team/oej/manager-check-trunk/main/udptl.c
    team/oej/manager-check-trunk/main/utils.c
    team/oej/manager-check-trunk/main/xml.c
    team/oej/manager-check-trunk/main/xmldoc.c
    team/oej/manager-check-trunk/makeopts.in
    team/oej/manager-check-trunk/pbx/   (props changed)
    team/oej/manager-check-trunk/pbx/Makefile
    team/oej/manager-check-trunk/pbx/pbx_ael.c
    team/oej/manager-check-trunk/pbx/pbx_config.c
    team/oej/manager-check-trunk/pbx/pbx_dundi.c
    team/oej/manager-check-trunk/pbx/pbx_lua.c
    team/oej/manager-check-trunk/pbx/pbx_realtime.c
    team/oej/manager-check-trunk/pbx/pbx_spool.c
    team/oej/manager-check-trunk/res/   (props changed)
    team/oej/manager-check-trunk/res/Makefile
    team/oej/manager-check-trunk/res/ael/ael.flex
    team/oej/manager-check-trunk/res/ael/ael.tab.c
    team/oej/manager-check-trunk/res/ael/ael.y
    team/oej/manager-check-trunk/res/ael/ael_lex.c
    team/oej/manager-check-trunk/res/ael/pval.c
    team/oej/manager-check-trunk/res/ais/clm.c
    team/oej/manager-check-trunk/res/ais/evt.c
    team/oej/manager-check-trunk/res/res_adsi.c
    team/oej/manager-check-trunk/res/res_agi.c
    team/oej/manager-check-trunk/res/res_calendar.c
    team/oej/manager-check-trunk/res/res_calendar_caldav.c
    team/oej/manager-check-trunk/res/res_calendar_exchange.c
    team/oej/manager-check-trunk/res/res_calendar_icalendar.c
    team/oej/manager-check-trunk/res/res_clialiases.c
    team/oej/manager-check-trunk/res/res_config_pgsql.c
    team/oej/manager-check-trunk/res/res_config_sqlite.c
    team/oej/manager-check-trunk/res/res_crypto.c
    team/oej/manager-check-trunk/res/res_jabber.c
    team/oej/manager-check-trunk/res/res_monitor.c
    team/oej/manager-check-trunk/res/res_musiconhold.c
    team/oej/manager-check-trunk/res/res_mutestream.c
    team/oej/manager-check-trunk/res/res_odbc.c
    team/oej/manager-check-trunk/res/res_phoneprov.c
    team/oej/manager-check-trunk/res/res_rtp_asterisk.c
    team/oej/manager-check-trunk/res/res_rtp_multicast.c
    team/oej/manager-check-trunk/res/res_smdi.c
    team/oej/manager-check-trunk/res/res_speech.c
    team/oej/manager-check-trunk/res/snmp/agent.c
    team/oej/manager-check-trunk/sounds/Makefile
    team/oej/manager-check-trunk/tests/   (props changed)
    team/oej/manager-check-trunk/tests/Makefile
    team/oej/manager-check-trunk/tests/test_ast_format_str_reduce.c
    team/oej/manager-check-trunk/tests/test_heap.c
    team/oej/manager-check-trunk/tests/test_sched.c
    team/oej/manager-check-trunk/tests/test_skel.c
    team/oej/manager-check-trunk/tests/test_substitution.c
    team/oej/manager-check-trunk/utils/   (props changed)
    team/oej/manager-check-trunk/utils/Makefile
    team/oej/manager-check-trunk/utils/extconf.c
    team/oej/manager-check-trunk/utils/utils.xml

Propchange: team/oej/manager-check-trunk/
------------------------------------------------------------------------------
    automerge = http://www.codename-pineapple.org/

Propchange: team/oej/manager-check-trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-blocked' - no diff available.

Propchange: team/oej/manager-check-trunk/
------------------------------------------------------------------------------
Binary property 'branch-1.4-merged' - no diff available.

Propchange: team/oej/manager-check-trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (added)
+++ svn:mergeinfo Fri Jul 16 16:13:13 2010
@@ -1,0 +1,2 @@
+/be/branches/C.3:256426
+/trunk:270974

Propchange: team/oej/manager-check-trunk/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jul 16 16:13:13 2010
@@ -1,1 +1,1 @@
-/trunk:1-242225
+/trunk:1-277410

Modified: team/oej/manager-check-trunk/.cleancount
URL: http://svnview.digium.com/svn/asterisk/team/oej/manager-check-trunk/.cleancount?view=diff&rev=277487&r1=277486&r2=277487
==============================================================================
--- team/oej/manager-check-trunk/.cleancount (original)
+++ team/oej/manager-check-trunk/.cleancount Fri Jul 16 16:13:13 2010
@@ -1,2 +1,3 @@
-37
+38
 
+

Modified: team/oej/manager-check-trunk/CHANGES
URL: http://svnview.digium.com/svn/asterisk/team/oej/manager-check-trunk/CHANGES?view=diff&rev=277487&r1=277486&r2=277487
==============================================================================
--- team/oej/manager-check-trunk/CHANGES (original)
+++ team/oej/manager-check-trunk/CHANGES Fri Jul 16 16:13:13 2010
@@ -56,11 +56,32 @@
  * Added 'use_q850_reason' configuration option for generating and parsing
    if available  Reason: Q.850;cause=<cause code> header. It is implemented
    in some gateways for better passing PRI/SS7 cause codes via SIP.
+ * When dialing SIP peers, a new component may be added to the end of the dialstring
+   to indicate that a specific remote IP address or host should be used when dialing
+   the particular peer. The dialstring format is SIP/peer/exten/host_or_IP.
+ * SRTP SDES support for encrypting calls to/from Asterisk over SIP. The
+   ability to selectively force bridged channels to also be encrypted is also
+   implemented. Branching in the dialplan can be done based on whether or not
+   a channel has secure media and/or signaling.
+ * Added directmediapermit/directmediadeny to limit which peers can send direct media
+   to each other
+ * Added the 'snom_aoc_enabled' option to turn on support for sending Advice of
+   Charge messages to snom phones.
+ * Added support for G.719 media streams.
+ * Added support for 16khz signed linear media streams.
+ * SIP is now able to bind to and communicate with IPv6 addresses. In addition,
+   RTP has been outfitted with the same abilities.
+ * Added support for setting the Max-Forwards: header in SIP requests. Setting is

[... 92304 lines stripped ...]