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
This commit is contained in:
Automerge script
2013-01-09 23:20:35 +00:00
parent 7a06fdad89
commit e844969fba
4 changed files with 36 additions and 60 deletions

View File

@@ -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;