Author: ben Date: 2007-07-25 22:01:51 -0700 (Wed, 25 Jul 2007) New Revision: 5802
Modified: sandbox/ben/branches/cuppatea/ sandbox/ben/branches/cuppatea/README.txt Log: Merged revisions 5800-5801 via svnmerge from http://svn.openlaszlo.org/sandbox/ben/branches/cuppajoe ....... r5800 | ben | 2007-07-25 21:58:49 -0700 (Wed, 25 Jul 2007) | 1 line making an experimental change to test svnmerge ....... Property changes on: sandbox/ben/branches/cuppatea ___________________________________________________________________ Name: svnmerge-integrated - /openlaszlo/branches/legals:1-5797 /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/cuppajoe:1-5799 + /openlaszlo/branches/legals:1-5797 /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/cuppajoe:1-5801 Modified: sandbox/ben/branches/cuppatea/README.txt =================================================================== --- sandbox/ben/branches/cuppatea/README.txt 2007-07-26 05:00:43 UTC (rev 5801) +++ sandbox/ben/branches/cuppatea/README.txt 2007-07-26 05:01:51 UTC (rev 5802) @@ -1,5 +1,8 @@ LPS @VERSIONID@ README +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. + Here's what you'll find: LICENSE.txt - The End User License Agreement for the LPS. _______________________________________________ Laszlo-checkins mailing list [email protected] http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins
