[svn-commits] kmoore: branch kmoore/stasis-mwi r382056 - /team/kmoore/stasis-mwi/

[SVN commits to the Digium repositories]

Author: kmoore
Date: Mon Feb 25 12:59:25 2013
New Revision: 382056

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=382056
Log:
resolve conflict, enable automerge

Modified:
    team/kmoore/stasis-mwi/   (props changed)

Propchange: team/kmoore/stasis-mwi/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Feb 25 12:59:25 2013
@@ -1,1 +1,1 @@
-/team/dlee/stasis-core:1-382052 /trunk:1-381699
+/team/dlee/stasis-core:1-382052