From: Cherian Mathew <c.mathew@bgbm.org>
Date: Thu, 4 Jun 2015 13:30:07 +0000 (+0200)
Subject: Merge branch 'move-to-luna' of wp5.e-taxonomy.eu:/var/git/taxeditor into develop
X-Git-Tag: 3.6.0~6
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/afd232b8a927cfecf45a9b0e33d95d924db56700

Merge branch 'move-to-luna' of wp5.e-taxonomy.eu:/var/git/taxeditor into develop

Conflicts:
	eu.etaxonomy.taxeditor.cdmlib/.classpath
---

afd232b8a927cfecf45a9b0e33d95d924db56700
diff --cc eu.etaxonomy.taxeditor.cdmlib/.classpath
index fe9dcabde,390956d2a..b94a8b1d0
--- a/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@@ -193,22 -193,22 +193,6 @@@
  	<classpathentry exported="true" kind="lib" path="lib/spring-security-remoting-3.1.3.RELEASE.jar"/>
  	<classpathentry exported="true" kind="lib" path="lib/jena-core-2.11.2.jar"/>
  	<classpathentry exported="true" kind="lib" path="lib/jena-iri-1.0.2.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.6.0-sources.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.6.0.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.6.0-sources.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.6.0.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.6.0-sources.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.6.0.jar" sourcepath="lib/cdmlib-io-3.6.0-sources.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.6.0-sources.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.6.0.jar" sourcepath="lib/cdmlib-model-3.6.0-sources.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.6.0-sources.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.6.0.jar" sourcepath="lib/cdmlib-persistence-3.6.0-sources.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.6.0-sources.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.6.0.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.6.0-sources.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.6.0.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.6.0-sources.jar"/>
- 	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.6.0.jar" sourcepath="lib/cdmlib-services-3.6.0-sources.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.5.2-SNAPSHOT-sources.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.5.2-SNAPSHOT.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.5.2-SNAPSHOT-sources.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.5.2-SNAPSHOT.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.5.2-SNAPSHOT-sources.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.5.2-SNAPSHOT.jar" sourcepath="lib/cdmlib-io-3.5.2-SNAPSHOT-sources.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.5.2-SNAPSHOT-sources.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.5.2-SNAPSHOT.jar" sourcepath="lib/cdmlib-model-3.5.2-SNAPSHOT-sources.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.5.2-SNAPSHOT-sources.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.5.2-SNAPSHOT.jar" sourcepath="lib/cdmlib-persistence-3.5.2-SNAPSHOT-sources.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.5.2-SNAPSHOT-sources.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.5.2-SNAPSHOT.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.5.2-SNAPSHOT-sources.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.5.2-SNAPSHOT.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.5.2-SNAPSHOT-sources.jar"/>
 -	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.5.2-SNAPSHOT.jar" sourcepath="lib/cdmlib-services-3.5.2-SNAPSHOT-sources.jar"/>
  	<classpathentry exported="true" kind="lib" path="lib/poi-3.10-FINAL.jar"/>
  	<classpathentry exported="true" kind="lib" path="lib/poi-ooxml-3.10-FINAL.jar"/>
  	<classpathentry exported="true" kind="lib" path="lib/xmlbeans-2.3.0.jar"/>