svn commit: smb-build r54 - in trunk: .

[jelmer at samba.org]

Author: jelmer
Date: 2006-07-04 03:18:16 +0000 (Tue, 04 Jul 2006)
New Revision: 54

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=smb-build&rev=54

Log:
Fake merge
Modified:
   trunk/
   trunk/foobar


Changeset:

Property changes on: trunk
___________________________________________________________________
Name: bzr:merge
   + revision-id2 revision-id3


Modified: trunk/foobar
===================================================================
--- trunk/foobar	2006-07-04 02:59:07 UTC (rev 53)
+++ trunk/foobar	2006-07-04 03:18:16 UTC (rev 54)
@@ -1,4 +1,4 @@
-fsdfsdx: z
+fsdfsdfsdfsdfsdx: z
 
 z y: c
 	echo DOUBLE COLON WORKS