2 Commits

Author	SHA1	Message	Date
Jonathan Rose	8fbe62f5df	configuration samples: Pull all parking related stuff out of features.conf ... This patch also adds documentation for parking from features.conf to res_parking.conf ........ Merged revisions 400205 from http://svn.asterisk.org/svn/asterisk/branches/12 git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@400206 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2013-09-30 21:40:36 +00:00
Richard Mudgett	3d63833bd6	Merge in the bridge_construction branch to make the system use the Bridging API. ... Breaks many things until they can be reworked. A partial list: chan_agent chan_dahdi, chan_misdn, chan_iax2 native bridging app_queue COLP updates DTMF attended transfers Protocol attended transfers git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@389378 65c4cc65-6c06-0410-ace0-fbb531ad65f3	2013-05-21 18:00:22 +00:00