Automerge script dd85c232f0 Merged revisions 376416 via svnmerge from ...

file:///srv/subversion/repos/asterisk/trunk

................
  r376416 | mjordan | 2012-11-18 08:31:32 -0600 (Sun, 18 Nov 2012) | 13 lines
  
  Add a test event that reports changes in ConfBridge state
  
  This patch adds a test event to ConfBridge that reports transitions between
  states in ConfBridge.  This is used by tests in the Asterisk Test Suite
  that verify state changes based on the entering/leaving of conference
  participants.
  ........
  
  Merged revisions 376414 from http://svn.asterisk.org/svn/asterisk/branches/10
  ........
  
  Merged revisions 376415 from http://svn.asterisk.org/svn/asterisk/branches/11
................


git-svn-id: https://origsvn.digium.com/svn/asterisk/team/mmichelson/threadpool@376422 65c4cc65-6c06-0410-ace0-fbb531ad65f3

2012-11-18 15:20:26 +00:00

..

include

Resolve issues in ConfBridge regarding marked, waitmarked, and unmarked users

2012-10-08 18:48:34 +00:00

conf_config_parser.c

Don't destroy confbridge config when error is encountered during a reload.

2012-10-01 16:26:23 +00:00

conf_state_empty.c

Resolve issues in ConfBridge regarding marked, waitmarked, and unmarked users

2012-10-08 18:48:34 +00:00

conf_state_inactive.c

Resolve issues in ConfBridge regarding marked, waitmarked, and unmarked users

2012-10-08 18:48:34 +00:00

conf_state_multi_marked.c

Resolve issues in ConfBridge regarding marked, waitmarked, and unmarked users

2012-10-08 18:48:34 +00:00

conf_state_multi.c

Resolve issues in ConfBridge regarding marked, waitmarked, and unmarked users

2012-10-08 18:48:34 +00:00

conf_state_single_marked.c

Resolve issues in ConfBridge regarding marked, waitmarked, and unmarked users

2012-10-08 18:48:34 +00:00

conf_state_single.c

Resolve issues in ConfBridge regarding marked, waitmarked, and unmarked users

2012-10-08 18:48:34 +00:00

conf_state.c

Merged revisions 376416 via svnmerge from

2012-11-18 15:20:26 +00:00