[asterisk-commits] kmoore: branch kmoore/stasis-bridge_events r385979 - in /team/kmoore/stasis-b...

[SVN commits to the Asterisk project]

Author: kmoore
Date: Wed Apr 17 13:40:53 2013
New Revision: 385979

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=385979
Log:
Restore app_stasis.c after a botched merge
........

Merged revisions 385977 from http://svn.asterisk.org/svn/asterisk/team/kmoore/stasis-bridging-channel_events

Added:
    team/kmoore/stasis-bridge_events/apps/app_stasis.c
      - copied unchanged from r385977, team/kmoore/stasis-bridging-channel_events/apps/app_stasis.c
Modified:
    team/kmoore/stasis-bridge_events/   (props changed)

Propchange: team/kmoore/stasis-bridge_events/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Wed Apr 17 13:40:53 2013
@@ -1,1 +1,1 @@
-/team/kmoore/stasis-bridging-channel_events:1-385975
+/team/kmoore/stasis-bridging-channel_events:1-385977