Author: ben
Date: 2007-07-25 21:50:03 -0700 (Wed, 25 Jul 2007)
New Revision: 5799

Modified:
   sandbox/ben/branches/cuppajoe/build.properties
Log:
changing version string to test bidirectional merges

Modified: sandbox/ben/branches/cuppajoe/build.properties
===================================================================
--- sandbox/ben/branches/cuppajoe/build.properties      2007-07-26 04:47:07 UTC 
(rev 5798)
+++ sandbox/ben/branches/cuppajoe/build.properties      2007-07-26 04:50:03 UTC 
(rev 5799)
@@ -3,11 +3,11 @@
 #LPS things
 #
 LPS_NAME = OpenLaszlo
-version.id = 4.0.x
-version.id.upper = 4.0.x
+version.id = cuppajoe
+version.id.upper = cuppajoe
 # Set this in a release to the release name
 release = Latest
-release.id = 4.0.x
+release.id = cuppajoe
 # Set this in a release to the release build
 # Otherwise an ant task will compute it from svn
 #build.id


_______________________________________________
Laszlo-checkins mailing list
[email protected]
http://www.openlaszlo.org/mailman/listinfo/laszlo-checkins

Reply via email to