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

[asterisk-commits at lists.digium.com]

Author: oej
Date: Tue Nov 21 08:19:13 2006
New Revision: 47885

URL: http://svn.digium.com/view/asterisk?view=rev&rev=47885
Log:
Arguing with svnmerge

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

Propchange: team/oej/videocaps/
            ('svnmerge-blocked' removed)

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