From: Patric Plitzner
Date: Mon, 13 Oct 2014 12:56:08 +0000 (+0000)
Subject: merge-update from trunk
X-Git-Tag: 3.6.0~393^2~20
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/c365ebc7f0806edb2a13292db1fe2182e7e5fb92
merge-update from trunk
---
c365ebc7f0806edb2a13292db1fe2182e7e5fb92
diff --cc eu.etaxonomy.taxeditor.cdmlib/build.properties
index 69211ff4d,a022a611f..2c33c378c
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@@ -186,23 -202,9 +186,29 @@@ bin.includes = META-INF/,
lib/google-api-translate-java-0.92.jar,\
lib/odfdom-0.8.jar,\
lib/h2mig_pagestore_addon.jar,\
++<<<<<<< .working
+ lib/spring-security-remoting-3.1.3.RELEASE.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/spring-security-remoting-3.1.3.RELEASE.jar,\
+ lib/jena-core-2.12.1-SNAPSHOT.jar,\
+ lib/jena-iri-1.1.1-SNAPSHOT.jar
++>>>>>>> .merge-rechts.r21823
jars.compile.order = .
output.. = bin/
source.. = src/main/java/,\