merge develop into branch
authorPatrick Plitzner <p.plitzner@bgbm.org>
Tue, 12 Apr 2016 07:58:49 +0000 (09:58 +0200)
committerPatrick Plitzner <p.plitzner@bgbm.org>
Tue, 12 Apr 2016 07:58:49 +0000 (09:58 +0200)
commita5e2004dcb8e7d06080a79b2bd7c213c076539c9
tree85b1be08b11684f20c5dc16032ad98d3be4d8068
parent0ed26a714c826f5a15bd125366cc2d53f12a5873
merge develop into branch
23 files changed:
eu.etaxonomy.taxeditor.cdmlib/src/main/resources/etc/jetty/cdmlib-remote-webapp.war [new file with mode: 0644]
eu.etaxonomy.taxeditor.feature.jre.linux64/target/eu.etaxonomy.taxeditor.feature.jre.linux64-4.0.0-SNAPSHOT.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.feature.jre.linux64/target/feature.xml [new file with mode: 0644]
eu.etaxonomy.taxeditor.feature.jre.linux64/target/local-artifacts.properties [new file with mode: 0644]
eu.etaxonomy.taxeditor.feature.jre.linux64/target/maven-archiver/pom.properties [new file with mode: 0644]
eu.etaxonomy.taxeditor.feature.jre.linux64/target/p2artifacts.xml [new file with mode: 0644]
eu.etaxonomy.taxeditor.feature.jre.linux64/target/p2content.xml [new file with mode: 0644]
eu.etaxonomy.taxeditor.webapp/lib/cdmlib-remote-webapp.war [new file with mode: 0644]
eu.etaxonomy.taxeditor.webapp/target/MANIFEST.MF [new file with mode: 0644]
eu.etaxonomy.taxeditor.webapp/target/antrun/build-main.xml [new file with mode: 0644]
eu.etaxonomy.taxeditor.webapp/target/classes/etc/jetty/.svnignore [new file with mode: 0644]
eu.etaxonomy.taxeditor.webapp/target/classes/etc/jetty/jetty-runner-9.2.3.v20140905.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.webapp/target/classes/etc/jetty/start-9.2.3.v20140905.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.webapp/target/classes/eu/etaxonomy/taxeditor/webapp/CDMEmbeddedServerException.class [new file with mode: 0644]
eu.etaxonomy.taxeditor.webapp/target/classes/eu/etaxonomy/taxeditor/webapp/CDMServer$1.class [new file with mode: 0644]
eu.etaxonomy.taxeditor.webapp/target/classes/eu/etaxonomy/taxeditor/webapp/CDMServer.class [new file with mode: 0644]
eu.etaxonomy.taxeditor.webapp/target/classes/eu/etaxonomy/taxeditor/webapp/ICDMServerError.class [new file with mode: 0644]
eu.etaxonomy.taxeditor.webapp/target/classes/eu/etaxonomy/taxeditor/webapp/TaxeditorWebappPlugin.class [new file with mode: 0644]
eu.etaxonomy.taxeditor.webapp/target/eu.etaxonomy.taxeditor.webapp-4.0.0-SNAPSHOT.jar [new file with mode: 0644]
eu.etaxonomy.taxeditor.webapp/target/local-artifacts.properties [new file with mode: 0644]
eu.etaxonomy.taxeditor.webapp/target/maven-archiver/pom.properties [new file with mode: 0644]
eu.etaxonomy.taxeditor.webapp/target/p2artifacts.xml [new file with mode: 0644]
eu.etaxonomy.taxeditor.webapp/target/p2content.xml [new file with mode: 0644]