merge from trunk
authorCherian Mathew <c.mathew@bgbm.org>
Tue, 9 Dec 2014 17:05:29 +0000 (17:05 +0000)
committerCherian Mathew <c.mathew@bgbm.org>
Tue, 9 Dec 2014 17:05:29 +0000 (17:05 +0000)
1  2 
.gitattributes
eu.etaxonomy.taxeditor.cdmlib/.classpath
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/store/CdmStore.java

diff --cc .gitattributes
Simple merge
index cb24e554dd00a409df9a6e79616ff9bebd5a221b,06b551fc609f9c792426b81a3db3512d95561626..b0f6b689650a697afc204ae5cea0730977d0ff87
@@@ -635,19 -597,20 +635,19 @@@ Bundle-ClassPath: .
   lib/spring-security-remoting-3.1.3.RELEASE.jar,
   lib/jena-core-2.11.2.jar,
   lib/jena-iri-1.0.2.jar,
-  lib/cdmlib-commons-3.4.0-SNAPSHOT-sources.jar,
-  lib/cdmlib-commons-3.4.0-SNAPSHOT.jar,
-  lib/cdmlib-ext-3.4.0-SNAPSHOT-sources.jar,
-  lib/cdmlib-ext-3.4.0-SNAPSHOT.jar,
-  lib/cdmlib-io-3.4.0-SNAPSHOT-sources.jar,
-  lib/cdmlib-io-3.4.0-SNAPSHOT.jar,
-  lib/cdmlib-model-3.4.0-SNAPSHOT-sources.jar,
-  lib/cdmlib-model-3.4.0-SNAPSHOT.jar,
-  lib/cdmlib-persistence-3.4.0-SNAPSHOT-sources.jar,
-  lib/cdmlib-persistence-3.4.0-SNAPSHOT.jar,
-  lib/cdmlib-print-3.4.0-SNAPSHOT-sources.jar,
-  lib/cdmlib-print-3.4.0-SNAPSHOT.jar,
-  lib/cdmlib-remote-3.4.0-SNAPSHOT-sources.jar,
-  lib/cdmlib-remote-3.4.0-SNAPSHOT.jar,
-  lib/cdmlib-services-3.4.0-SNAPSHOT-sources.jar,
-  lib/cdmlib-services-3.4.0-SNAPSHOT.jar
+  lib/cdmlib-commons-3.5.0-SNAPSHOT-sources.jar,
+  lib/cdmlib-commons-3.5.0-SNAPSHOT.jar,
+  lib/cdmlib-ext-3.5.0-SNAPSHOT-sources.jar,
+  lib/cdmlib-ext-3.5.0-SNAPSHOT.jar,
+  lib/cdmlib-io-3.5.0-SNAPSHOT-sources.jar,
+  lib/cdmlib-io-3.5.0-SNAPSHOT.jar,
+  lib/cdmlib-model-3.5.0-SNAPSHOT-sources.jar,
+  lib/cdmlib-model-3.5.0-SNAPSHOT.jar,
+  lib/cdmlib-persistence-3.5.0-SNAPSHOT-sources.jar,
+  lib/cdmlib-persistence-3.5.0-SNAPSHOT.jar,
+  lib/cdmlib-print-3.5.0-SNAPSHOT-sources.jar,
+  lib/cdmlib-print-3.5.0-SNAPSHOT.jar,
+  lib/cdmlib-remote-3.5.0-SNAPSHOT-sources.jar,
+  lib/cdmlib-remote-3.5.0-SNAPSHOT.jar,
+  lib/cdmlib-services-3.5.0-SNAPSHOT-sources.jar,
+  lib/cdmlib-services-3.5.0-SNAPSHOT.jar
 -Import-Package: eu.etaxonomy.cdm.api.application