[asterisk-commits] oej: branch oej/videocaps r47878 - /team/oej/videocaps/

[asterisk-commits at lists.digium.com]

Author: oej
Date: Tue Nov 21 04:57:05 2006
New Revision: 47878

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

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

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

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

Propchange: team/oej/videocaps/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Tue Nov 21 04:57:05 2006
@@ -1,1 +1,1 @@
-/branches/1.4:1-47483
+/branches/1.4:1-47483 /trunk:1-47764