[asterisk-commits] jrose: branch jrose/bridge_projects r383788 - /team/jrose/bridge_projects/

[SVN commits to the Asterisk project]

Author: jrose
Date: Mon Mar 25 16:30:02 2013
New Revision: 383788

URL: http://svnview.digium.com/svn/asterisk?view=rev&rev=383788
Log:
fix automerge problems... hopefully take 2

Modified:
    team/jrose/bridge_projects/   (props changed)

Propchange: team/jrose/bridge_projects/
------------------------------------------------------------------------------
    automerge = *

Propchange: team/jrose/bridge_projects/
------------------------------------------------------------------------------
--- bridge_construction-integrated (original)
+++ bridge_construction-integrated Mon Mar 25 16:30:02 2013
@@ -1,1 +1,1 @@
-/trunk:383777
+trunk:1-383777

Propchange: team/jrose/bridge_projects/
------------------------------------------------------------------------------
--- bridge_projects-integrated (original)
+++ bridge_projects-integrated Mon Mar 25 16:30:02 2013
@@ -1,1 +1,1 @@
-/team/group/bridge_construction:1-383562
+/team/group/bridge_construction:1-383777