From: Patric Plitzner <p.plitzner@bgbm.org>
Date: Fri, 7 Jun 2013 10:02:49 +0000 (+0000)
Subject: merge from trunk
X-Git-Tag: 3.6.0~968^2~16
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/46294101df429560406d98729427215ecaaca8bb?hp=72cdfc6d8cffe4ac8b5982f7dcb76c0c5c7575a4

merge from trunk
---

diff --git a/pom.xml b/pom.xml
index d65fcd181..9fbe13094 100644
--- a/pom.xml
+++ b/pom.xml
@@ -6,7 +6,7 @@
   </prerequisites>
   <groupId>eu.etaxonomy</groupId>
   <artifactId>taxeditor-parent</artifactId>
-  <version>3.2.0-SNAPSHOT</version>
+  <version>3.2.2-SNAPSHOT</version>
   <name>EDIT Taxonomic Editor</name>
   <description>The Taxonomic Editor for EDIT's platform for cybertaxonomy</description>
   <url>http://wp5.e-taxonomy.eu</url>
@@ -15,10 +15,10 @@
   <properties>
     <java.codelevel>1.6</java.codelevel>
     <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
-    <cdmlib.version>3.2.0-SNAPSHOT</cdmlib.version>
+    <cdmlib.version>3.2.2-SNAPSHOT</cdmlib.version>
     <!-- TODO can we use project.version ????? -->
     <tycho.version>0.14.0</tycho.version>
-    <taxeditor.version>3.2.0-SNAPSHOT</taxeditor.version>
+    <taxeditor.version>3.2.2-SNAPSHOT</taxeditor.version>
   </properties>
   <modules>
     <module>eu.etaxonomy.taxeditor.cdmlib</module>