Author: reto
Date: Mon Dec 21 15:20:58 2009
New Revision: 892849
URL: http://svn.apache.org/viewvc?rev=892849&view=rev
Log:
CLEREZZA-25: merged down default
Modified:
incubator/clerezza/issues/CLEREZZA-25/org.apache.clerezza.platform.content/
(props changed)
incubator/clerezza/issues/CLEREZZA-25/org.apache.clerezza.platform.content/pom.xml
Propchange:
incubator/clerezza/issues/CLEREZZA-25/org.apache.clerezza.platform.content/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Mon Dec 21 15:20:58 2009
@@ -1 +1 @@
-/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.content:890392-891033
+/incubator/clerezza/trunk/org.apache.clerezza.parent/org.apache.clerezza.webapp.parent/org.apache.clerezza.platform.content:890392-891033,891178-892843
Modified:
incubator/clerezza/issues/CLEREZZA-25/org.apache.clerezza.platform.content/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/clerezza/issues/CLEREZZA-25/org.apache.clerezza.platform.content/pom.xml?rev=892849&r1=892848&r2=892849&view=diff
==============================================================================
---
incubator/clerezza/issues/CLEREZZA-25/org.apache.clerezza.platform.content/pom.xml
(original)
+++
incubator/clerezza/issues/CLEREZZA-25/org.apache.clerezza.platform.content/pom.xml
Mon Dec 21 15:20:58 2009
@@ -4,11 +4,11 @@
<parent>
<artifactId>org.apache.clerezza.webapp.parent</artifactId>
<groupId>org.apache.clerezza</groupId>
- <version>0.2-SNAPSHOT</version>
+ <version>0.2-incubating-SNAPSHOT</version>
</parent>
<groupId>org.apache.clerezza</groupId>
<artifactId>org.apache.clerezza.platform.content</artifactId>
- <version>0.13-SNAPSHOT</version>
+ <version>0.13-incubating-SNAPSHOT</version>
<packaging>bundle</packaging>
<name>Clerezza - Platform Content</name>