aboutsummaryrefslogtreecommitdiffstats
path: root/main/features.c
diff options
context:
space:
mode:
authorPatrick McHardy <kaber@trash.net>2011-07-22 16:44:20 +0200
committerPatrick McHardy <kaber@trash.net>2011-07-22 16:44:20 +0200
commit2b9be10b177024bd663bd5fce19ea0fb76260c27 (patch)
treef6c296350683ee94c120213bef57e14fd153b23a /main/features.c
parent916e420bf0c8db7a8cb1f60557cd2807652142cf (diff)
parent28da2a199d7e1624ac56ccb27d3671117f4e2717 (diff)
Merge branch 'master' of 192.168.0.100:/repos/git/asteriskHEADmaster
Diffstat (limited to 'main/features.c')
-rw-r--r--main/features.c8
1 files changed, 5 insertions, 3 deletions
diff --git a/main/features.c b/main/features.c
index 06ec1b698..60f8667d8 100644
--- a/main/features.c
+++ b/main/features.c
@@ -23,6 +23,10 @@
* \author Mark Spencer <markster@digium.com>
*/
+/*** MODULEINFO
+ <support_level>core</support_level>
+ ***/
+
#include "asterisk.h"
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
@@ -1989,7 +1993,7 @@ static int check_compat(struct ast_channel *c, struct ast_channel *newchan)
/*!
* \internal
* \brief Builtin attended transfer failed cleanup.
- * \since 1.10
+ * \since 10.0
*
* \param transferee Party A in the transfer.
* \param transferer Party B in the transfer.
@@ -6145,8 +6149,6 @@ static int bridge_exec(struct ast_channel *chan, const char *data)
"Channel2: %s\r\n", chan->name, args.dest_chan);
}
- ast_channel_unlock(current_dest_chan);
-
do_bridge_masquerade(current_dest_chan, final_dest_chan);
chans[0] = current_dest_chan;