merge Russell's 'hold_handling' branch, finally implementing music-on-hold handling...
authorKevin P. Fleming <kpfleming@digium.com>
Wed, 19 Jul 2006 20:44:39 +0000 (20:44 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Wed, 19 Jul 2006 20:44:39 +0000 (20:44 +0000)
commit6d0742fc1657017a3e69558b6192399b2f8469e6
tree3c36781db3a5a7a08967cbe8d83acb5d82e581cb
parent54e1f06c463bf72fa730f9be042d62f4ee2c4593
merge Russell's 'hold_handling' branch, finally implementing music-on-hold handling the way it was decided at AstriDevCon Europe 2006 (and the way people really want it to be)

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@37988 65c4cc65-6c06-0410-ace0-fbb531ad65f3
30 files changed:
apps/app_dial.c
apps/app_followme.c
apps/app_meetme.c
apps/app_queue.c
channel.c
channels/chan_agent.c
channels/chan_alsa.c
channels/chan_h323.c
channels/chan_iax2.c
channels/chan_jingle.c
channels/chan_mgcp.c
channels/chan_misdn.c
channels/chan_oss.c
channels/chan_phone.c
channels/chan_sip.c
channels/chan_skinny.c
channels/chan_vpb.cc
channels/chan_zap.c
configs/alsa.conf.sample
configs/features.conf.sample
configs/iax.conf.sample
configs/queues.conf.sample
configs/sip.conf.sample
configs/skinny.conf.sample
configs/zapata.conf.sample
include/asterisk/musiconhold.h
pbx.c
res/res_agi.c
res/res_features.c
res/res_musiconhold.c