From: Patric Plitzner <p.plitzner@bgbm.org>
Date: Thu, 29 Aug 2013 13:42:11 +0000 (+0000)
Subject: merge-update from trunk
X-Git-Tag: 3.6.0~841^2~123
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/b04ed1c348548b60ece8c5b597fbf2b770a3f964

merge-update from trunk
---

b04ed1c348548b60ece8c5b597fbf2b770a3f964
diff --cc pom.xml
index 33505614c,8c6b39438..d439a64f4
--- a/pom.xml
+++ b/pom.xml
@@@ -15,10 -15,10 +15,10 @@@
    <properties>
      <java.codelevel>1.6</java.codelevel>
      <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 -    <cdmlib.version>3.2.3</cdmlib.version>
 +    <cdmlib.version>3.3.0-SNAPSHOT</cdmlib.version>
      <!-- TODO can we use project.version ????? -->
      <tycho.version>0.14.0</tycho.version>
-     <taxeditor.version>3.2.3-SNAPSHOT</taxeditor.version>
+     <taxeditor.version>3.2.3</taxeditor.version>
    </properties>
    <modules>
      <module>eu.etaxonomy.taxeditor.cdmlib</module>