diff options
| author | Automerge script <automerge@asterisk.org> | 2013-01-09 23:20:35 +0000 |
|---|---|---|
| committer | Automerge script <automerge@asterisk.org> | 2013-01-09 23:20:35 +0000 |
| commit | e844969fbaa997e7050dba14a355c1267bed81af (patch) | |
| tree | d6d3f631f391f4b09e8312b3df27c4555998c891 /include | |
| parent | 7a06fdad8916a932e7321f65675fce9950ea8ea1 (diff) | |
Merged revisions 378840 via svnmerge from
file:///srv/subversion/repos/asterisk/trunk
........
r378840 | rmudgett | 2013-01-09 16:56:08 -0600 (Wed, 09 Jan 2013) | 2 lines
Trivial misc bridge code changes.
........
git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@378851 65c4cc65-6c06-0410-ace0-fbb531ad65f3
Diffstat (limited to 'include')
| -rw-r--r-- | include/asterisk/bridging_features.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/asterisk/bridging_features.h b/include/asterisk/bridging_features.h index e32c183ac..2984684d4 100644 --- a/include/asterisk/bridging_features.h +++ b/include/asterisk/bridging_features.h @@ -44,8 +44,9 @@ enum ast_bridge_builtin_feature { AST_BRIDGE_BUILTIN_ATTENDEDTRANSFER, /*! DTMF Based Hangup Feature */ AST_BRIDGE_BUILTIN_HANGUP, + /*! End terminator for list of built in features. Must remain last. */ - AST_BRIDGE_BUILTIN_END, + AST_BRIDGE_BUILTIN_END }; struct ast_bridge; |