[asterisk-commits] kmoore: branch kmoore/stasis-bridge_events r385990 - /team/kmoore/stasis-brid...

[SVN commits to the Asterisk project]

Author: kmoore
Date: Thu Apr 18 08:48:22 2013
New Revision: 385990

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=385990
Log:
Fix a merge oops

Modified:
    team/kmoore/stasis-bridge_events/include/asterisk/stasis_bridging.h

Modified: team/kmoore/stasis-bridge_events/include/asterisk/stasis_bridging.h
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/stasis-bridge_events/include/asterisk/stasis_bridging.h?view=diff&rev=385990&r1=385989&r2=385990
==============================================================================
--- team/kmoore/stasis-bridge_events/include/asterisk/stasis_bridging.h (original)
+++ team/kmoore/stasis-bridge_events/include/asterisk/stasis_bridging.h Thu Apr 18 08:48:22 2013
@@ -40,7 +40,8 @@
 		/*! Bridge technology that is handling the bridge */
 		AST_STRING_FIELD(technology);
 	);
-	/*! Linked list of channels participating in the bridge */
+	/*! AO2 container of bare channel uniqueid strings participating in the bridge
+	 * Allocated from ast_str_container_alloc() */
 	struct ao2_container *channels;
 	/*! Bridge flags to tweak behavior */
 	struct ast_flags feature_flags;