put changes with the correct version

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@263808 65c4cc65-6c06-0410-ace0-fbb531ad65f3
This commit is contained in:
Jeff Peeler
2010-05-18 19:30:19 +00:00
parent 94df424e1d
commit 115f5076f5

View File

@@ -146,6 +146,7 @@ Applications
user if it exists, otherwise will play the mailbox number. user if it exists, otherwise will play the mailbox number.
* Added custom device states to ConfBridge bridges. Use 'confbridge:<name>' to * Added custom device states to ConfBridge bridges. Use 'confbridge:<name>' to
retrieve state for a particular bridge, where <name> is the conference name retrieve state for a particular bridge, where <name> is the conference name
* app_directory now allows exiting at any time using the operator or pound key.
Dialplan Functions Dialplan Functions
------------------ ------------------
@@ -571,7 +572,6 @@ Applications
* Added ConfBridge dialplan application which does conference bridges without * Added ConfBridge dialplan application which does conference bridges without
DAHDI. For information on its use, please see the output of DAHDI. For information on its use, please see the output of
"core show application ConfBridge" from the CLI. "core show application ConfBridge" from the CLI.
* app_directory now allows exiting at any time using the operator or pound key.
Miscellaneous Miscellaneous
------------- -------------