[asterisk-commits] qwell: branch qwell/fun_with_transports r387479 - /team/qwell/fun_with_transp...

[SVN commits to the Asterisk project]

Author: qwell
Date: Thu May  2 14:02:01 2013
New Revision: 387479

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=387479
Log:
Update props, to allow for automerge.

Modified:
    team/qwell/fun_with_transports/   (props changed)

Propchange: team/qwell/fun_with_transports/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/qwell/fun_with_transports/
------------------------------------------------------------------------------
--- automerge-propname (added)
+++ automerge-propname Thu May  2 14:02:01 2013
@@ -1,0 +1,1 @@
+pimp_my_sip-integrated

Propchange: team/qwell/fun_with_transports/
------------------------------------------------------------------------------
--- pimp_my_sip-integrated (added)
+++ pimp_my_sip-integrated Thu May  2 14:02:01 2013
@@ -1,0 +1,1 @@
+/team/group/pimp_my_sip:1-387077,386867,387097

Propchange: team/qwell/fun_with_transports/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Thu May  2 14:02:01 2013
@@ -1,1 +1,1 @@
-/team/group/pimp_my_sip:1-387077,386867,387097 /trunk:1-386489,386540-386541,386577-386841
+/trunk:1-386489,386540-386541,386577-386841