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

[SVN commits to the Asterisk project]

Author: kmoore
Date: Fri Apr  5 08:47:15 2013
New Revision: 384810

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=384810
Log:
Add documentation for BridgeMerge

Modified:
    team/kmoore/stasis-bridge_events/main/manager_bridging.c

Modified: team/kmoore/stasis-bridge_events/main/manager_bridging.c
URL: http://svnview.digium.com/svn/asterisk/team/kmoore/stasis-bridge_events/main/manager_bridging.c?view=diff&rev=384810&r1=384809&r2=384810
==============================================================================
--- team/kmoore/stasis-bridge_events/main/manager_bridging.c (original)
+++ team/kmoore/stasis-bridge_events/main/manager_bridging.c Fri Apr  5 08:47:15 2013
@@ -98,6 +98,23 @@
 						<enum name="single"/>
 						<enum name="talker"/>
 					</enumlist>
+				</parameter>
+			</syntax>
+		</managerEventInstance>
+	</managerEvent>
+	<managerEvent language="en_US" name="BridgeMerge">
+		<managerEventInstance class="EVENT_FLAG_BRIDGE">
+			<synopsis>Raised when two bridges are merged.</synopsis>
+			<syntax>
+				<parameter name="BridgeUniqueidTo">
+				</parameter>
+				<parameter name="BridgeTypeTo">
+					<para>The type of bridge</para>
+				</parameter>
+				<parameter name="BridgeUniqueidFrom">
+				</parameter>
+				<parameter name="BridgeTypeFrom">
+					<para>The type of bridge</para>
 				</parameter>
 			</syntax>
 		</managerEventInstance>