[asterisk-commits] oej: branch oej/midcomstuff r48022 - /team/oej/midcomstuff/

[asterisk-commits at lists.digium.com]

Author: oej
Date: Sun Nov 26 04:05:55 2006
New Revision: 48022

URL: http://svn.digium.com/view/asterisk?view=rev&rev=48022
Log:
Initialize automatic merging in the midcomstuff branch...

Modified:
    team/oej/midcomstuff/   (props changed)

Propchange: team/oej/midcomstuff/
------------------------------------------------------------------------------
    automerge = http://edvina.net/training/

Propchange: team/oej/midcomstuff/
------------------------------------------------------------------------------
    automerge-email = oej at edvina.net

Propchange: team/oej/midcomstuff/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Sun Nov 26 04:05:55 2006
@@ -1,1 +1,1 @@
-/trunk:1-43181
+/branches/1.4:1-43376 /trunk:1-43181