merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Thu, 29 Aug 2013 13:42:11 +0000 (13:42 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Thu, 29 Aug 2013 13:42:11 +0000 (13:42 +0000)
1  2 
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
pom.xml

diff --cc pom.xml
index 33505614cc882a915e33ad6ffce2711dde9fbfc5,8c6b3943840369258f81bed3b448c8a7cc6fe6ca..d439a64f4cc43a40d7d1f8b285d3e48f2fa64472
+++ b/pom.xml
    <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>