[svn-commits] juggie: branch juggie/NoLossCDR r78333 - /team/juggie/NoLossCDR/

[SVN commits to the Digium repositories]

Author: juggie
Date: Mon Aug  6 21:23:46 2007
New Revision: 78333

URL: http://svn.digium.com/view/asterisk?view=rev&rev=78333
Log:
had to tweak automerge-integrated to merge off a branch

Modified:
    team/juggie/NoLossCDR/   (props changed)

Propchange: team/juggie/NoLossCDR/
------------------------------------------------------------------------------
--- automerge (original)
+++ automerge Mon Aug  6 21:23:46 2007
@@ -1,1 +1,1 @@
-yes
+*

Propchange: team/juggie/NoLossCDR/
------------------------------------------------------------------------------
--- automerge-email (original)
+++ automerge-email Mon Aug  6 21:23:46 2007
@@ -1,1 +1,1 @@
-murf at digium.com
+donnyk at gmail.com

Propchange: team/juggie/NoLossCDR/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Mon Aug  6 21:23:46 2007
@@ -1,1 +1,1 @@
-/trunk:1-78315
+/team/group/CDRfix5:1-78331