[Laszlo-checkins] r5806 - sandbox/ben/branches/cuppajoe

[ben@openlaszlo.org]

Author: ben
Date: 2007-07-25 22:09:49 -0700 (Wed, 25 Jul 2007)
New Revision: 5806

Modified:
   sandbox/ben/branches/cuppajoe/
   sandbox/ben/branches/cuppajoe/README.txt
Log:
Merged revisions 5804-5805 via svnmerge from 
http://svn.openlaszlo.org/sandbox/ben/branches/cuppatea

.......
  r5805 | ben | 2007-07-25 22:07:30 -0700 (Wed, 25 Jul 2007) | 1 line
  
  more experimental changes to figure out bidirectional merging with svnmerge
.......



Property changes on: sandbox/ben/branches/cuppajoe
___________________________________________________________________
Name: svnmerge-integrated
   - /openlaszlo/branches/legals:1-5746,5748-5756,5758-5770,5772-5796 /openlaszlo/trunk:1-3892,3894-3952,3954-4393,4395-4461,4463-4467,4469-4471,4473-5085,5087-5171,5173-5203,5205-5209,5211-5331,5333-5334 /sandbox/ben/branches/cuppatea:1-5803
   + /openlaszlo/branches/legals:1-5746,5748-5756,5758-5770,5772-5796 /openlaszlo/trunk:1-3892,3894-3952,3954-4393,4395-4461,4463-4467,4469-4471,4473-5085,5087-5171,5173-5203,5205-5209,5211-5331,5333-5334 /sandbox/ben/branches/cuppatea:1-5805

Modified: sandbox/ben/branches/cuppajoe/README.txt
===================================================================
--- sandbox/ben/branches/cuppajoe/README.txt	2007-07-26 05:07:30 UTC (rev 5805)
+++ sandbox/ben/branches/cuppajoe/README.txt	2007-07-26 05:09:49 UTC (rev 5806)
@@ -3,6 +3,8 @@
 Here is a lovely edit made by ben in the cuppajoe branch. We would like 
 to see this change turn up in the cuppatea branch eventually. 
 
+Another lovely change made in cuppatea. Will this make it back to cuppajoe?
+
 Here's what you'll find:
 
     LICENSE.txt           - The End User License Agreement for the LPS.