aboutsummaryrefslogtreecommitdiffstats
path: root/apps/app_confbridge.c
AgeCommit message (Collapse)AuthorFilesLines
2010-03-02Merged revisions 249892 via svnmerge from lmadsen1-1/+1
https://origsvn.digium.com/svn/asterisk/trunk ........ r249892 | lmadsen | 2010-03-02 14:02:56 -0500 (Tue, 02 Mar 2010) | 1 line Fix several XML documentation validate errors. ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@249894 f38db490-d61c-443f-a65b-d21fe96a405b
2009-09-29Merged revisions 220904 via svnmerge from mnicholson1-2/+3
https://origsvn.digium.com/svn/asterisk/trunk ........ r220904 | mnicholson | 2009-09-29 14:49:02 -0500 (Tue, 29 Sep 2009) | 5 lines Fix options 'm' and 's'. They were swapped in the code. Also document the fact that app_confbridge does not automatically answer the channel. (closes issue #15964) Reported by: shrift ........ git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.6.2@220905 f38db490-d61c-443f-a65b-d21fe96a405b
2009-03-11Don't play the "you are about to be placed into the conference" and "the ↵file1-10/+14
leader has left the conference" sounds if the quiet option is enabled. (reported by Vadim Lebedev on the asterisk-dev list) git-svn-id: http://svn.digium.com/svn/asterisk/trunk@181210 f38db490-d61c-443f-a65b-d21fe96a405b
2009-03-05Merge phase 1 support for the new bridging architecture.file1-0/+809
This commit brings in the bridging core, bridging technologies, and the ConfBridge application. For usage information on the ConfBridge application please see the output of "core show application ConfBridge" from the CLI. For API documentation please see the doxygen page describing the architecture and the documentation for each API call. Review: http://reviewboard.digium.com/r/93/ git-svn-id: http://svn.digium.com/svn/asterisk/trunk@180369 f38db490-d61c-443f-a65b-d21fe96a405b