Update of
/var/cvs/contributions/CMSContainer_Demo/www.cmscontainer.org/maven-base
In directory james.mmbase.org:/tmp/cvs-serv21513/www.cmscontainer.org/maven-base
Modified Files:
Tag: b1_5
project.properties
Log Message:
CMSC-1212 Language in editing environment is strange mixture of Dutch and
English
mmbase.version=1.8.7-20090103
LocaleTag fix
See also:
http://cvs.mmbase.org/viewcvs/contributions/CMSContainer_Demo/www.cmscontainer.org/maven-base
See also: http://www.mmbase.org/jira/browse/CMSC-1212
Index: project.properties
===================================================================
RCS file:
/var/cvs/contributions/CMSContainer_Demo/www.cmscontainer.org/maven-base/project.properties,v
retrieving revision 1.11.2.2
retrieving revision 1.11.2.3
diff -u -b -r1.11.2.2 -r1.11.2.3
--- project.properties 23 Dec 2008 16:03:45 -0000 1.11.2.2
+++ project.properties 3 Jan 2009 11:55:53 -0000 1.11.2.3
@@ -11,8 +11,12 @@
cmscportlets.version=1.5.0
cmscmodules.version=1.5.0
luceus.version=0.42
+<<<<<<< project.properties
+mmbase.version=1.8.7-20090103
+=======
lucene.version=2.3.2
mmbase.version=1.8.6-20080927
+>>>>>>> 1.11.2.2
# maven build does not yet generate a rmmci. Did not create one by hand
mmbasermmci.version=1.8.2-20061020
_______________________________________________
Cvs mailing list
[email protected]
http://lists.mmbase.org/mailman/listinfo/cvs
