eu.etaxonomy.taxeditor.cdmlib/README.txt -text
eu.etaxonomy.taxeditor.cdmlib/build.properties -text
eu.etaxonomy.taxeditor.cdmlib/lib/activation-1.1.1.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/antlr-2.7.7.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/aopalliance-1.0.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/aspectjrt-1.7.1.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/aspectjweaver-1.7.1.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/avro-1.6.3.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/batik-anim-1.7.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/batik-awt-util-1.7.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/batik-bridge-1.7.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/batik-css-1.7.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/batik-dom-1.7.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/batik-ext-1.7.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/batik-extension-1.7.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/batik-gvt-1.7.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/batik-js-1.7.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/batik-parser-1.7.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/batik-script-1.7.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/batik-svg-dom-1.7.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/batik-svggen-1.7.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/batik-transcoder-1.7.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/batik-util-1.7.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/batik-xml-1.7.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/c3p0-0.9.2.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/cglib-nodep-2.2.2.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/com.springsource.org.aopalliance-1.0.0.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/com.springsource.org.apache.commons.logging-1.1.1.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/commons-beanutils-1.8.3.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/commons-codec-20041127.091804.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/commons-collections-3.2.1.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/commons-dbcp-1.4.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/commons-io-2.4.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/commons-lang-2.6.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/commons-logging-1.1.2.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/commons-pool-1.5.4.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/concurrent-1.3.4.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/dbunit-2.4.9.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/dom4j-1.6.1.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/doxia-core-1.3.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/doxia-logging-api-1.3.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-apt-1.3.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/doxia-module-xhtml-1.3.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/doxia-sink-api-1.3.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/dozer-5.3.0.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/easymock-3.1.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/easymockclassextension-2.3.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-core-2.6.9.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/ezmorph-1.0.6.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/fop-1.1.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/google-api-translate-java-0.92.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/guava-r05.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/h2-1.3.170.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/h2mig_pagestore_addon.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/hamcrest-core-1.3.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-c3p0-4.1.10.Final.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-cglib-repack-2.1_3.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-commons-annotations-4.0.1.Final.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-core-4.1.10.Final.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-ehcache-4.1.10.Final.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-entitymanager-4.1.10.Final.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-envers-4.1.10.Final.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-jpa-2.0-api-1.0.1.Final.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-4.2.0.Final.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-analyzers-4.2.0.Final.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-engine-4.2.0.Final.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-search-orm-4.2.0.Final.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/hibernate-validator-4.3.1.Final.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/hsqldb-1.8.0.10.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/httpclient-4.2.3.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/httpcore-4.2.4.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/icu4j-2.6.1.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/identificationKeyAPI-1.0-SNAPSHOT-sources.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/identificationKeyAPI-1.0-SNAPSHOT.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/itextpdf-5.4.0.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/jackson-core-asl-1.8.8.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/jackson-mapper-asl-1.8.8.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/jakarta-regexp-1.4.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/javassist-3.17.1-GA.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-api-2.2.7.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-impl-2.2-EA.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/jaxb-xjc-2.2-EA.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/jaxb1-impl-2.2-EA.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/jaxen-1.1.4.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/jboss-logging-3.1.3.GA.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/jboss-transaction-api_1.1_spec-1.0.0.Final.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/jdbc4-2.0.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/jdom-1.1.3.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/jena-core-2.11.2.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/jena-iri-1.0.2.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/joda-time-2.1.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/json-lib-2.4-jdk15.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/jsr250-api-1.0.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/jtds-1.3.0.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/junit-4.11.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/junit-benchmarks-0.5.0.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/log4j-1.2.17.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/lsid-client-1.1.2.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/lsid-server-1.1.2.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/lucene-analyzers-3.6.2.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/lucene-core-3.6.2.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/lucene-facet-3.6.2.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/lucene-grouping-3.6.2.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/lucene-highlighter-3.6.2.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/lucene-kuromoji-3.6.2.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/lucene-memory-3.6.2.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/lucene-misc-3.6.2.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/lucene-phonetic-3.6.2.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/lucene-queries-3.6.2.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/lucene-smartcn-3.6.2.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/lucene-spatial-3.6.2.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/lucene-spellchecker-3.6.2.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/lucene-stempel-3.6.2.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/mchange-commons-java-0.2.3.3.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/mysql-connector-java-5.1.24.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/objenesis-1.2.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/odfdom-0.8.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/odfdom-java-0.8.7.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/ognl-2.6.9.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/opencsv-2.3.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.common-3.6.0.v20110523.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/org.osgi.core-1.0.0.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.aop-3.2.2.RELEASE.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.aspects-3.2.2.RELEASE.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.beans-3.2.2.RELEASE.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.context-3.2.2.RELEASE.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.core-3.2.2.RELEASE.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.expression-3.2.2.RELEASE.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.jdbc-3.2.2.RELEASE.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.orm-3.2.2.RELEASE.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.oxm-3.2.2.RELEASE.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.test-3.2.2.RELEASE.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.transaction-3.2.2.RELEASE.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web-3.2.2.RELEASE.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/org.springframework.web.servlet-3.2.2.RELEASE.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/osgi-3.6.0.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/p6spy-1.3.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/paranamer-2.3.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/plexus-classworlds-1.2-alpha-9.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/plexus-container-default-1.0-alpha-30.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/plexus-utils-2.0.5.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/poi-3.10-FINAL.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-3.10-FINAL.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/poi-ooxml-schemas-3.10-FINAL.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/postgresql-9.1-901.jdbc4.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/sanselan-0.97-incubator.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/servlet-api-2.5.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-api-1.7.2.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/slf4j-log4j12-1.7.2.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/snappy-java-1.0.4.1.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/solr-analysis-extras-3.6.2.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/solr-core-3.6.2.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/solr-solrj-3.6.2.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/spring-aop-3.2.2.RELEASE.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/spring-beans-3.2.2.RELEASE.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/spring-context-3.2.2.RELEASE.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/spring-context-support-3.2.2.RELEASE.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/spring-core-3.2.2.RELEASE.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/spring-expression-3.2.2.RELEASE.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/spring-modules-cache-0.7.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-config-3.1.3.RELEASE.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-core-3.1.3.RELEASE.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/spring-security-remoting-3.1.3.RELEASE.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/stax-1.2.0.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/stax-api-1.0.1.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/swagger-annotations-1.3.5.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/unitils-core-3.4.2.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/unitils-database-3.4.2.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/unitils-dbmaintainer-3.4.2.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/unitils-dbunit-3.4.2.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/unitils-spring-3.4.2.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/usertype.jodatime-2.0.1.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/usertype.spi-2.0.1.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/validation-api-1.0.0.GA.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/wsdl4j-1.6.2.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/xalan-2.6.0.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/xercesImpl-2.11.0.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/xml-apis-1.0.b2.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/xml-apis-ext-1.3.04.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/xml-resolver-1.2.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/xmlParserAPIs-2.6.2.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/xmlbeans-2.3.0.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/xmlgraphics-commons-1.5.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/xmlpull-1.1.3.1.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/xmlunit-1.4.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/xom-1.0.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/xpp3-1.1.4c.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/xpp3_min-1.1.4c.jar -text
-eu.etaxonomy.taxeditor.cdmlib/lib/xstream-1.4.4.jar -text
eu.etaxonomy.taxeditor.cdmlib/lib/yjp-controller-api-redist-9.0.8.jar -text
eu.etaxonomy.taxeditor.cdmlib/pom.xml -text
eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java -text
src/site/resources/css/site.css -text
src/site/resources/images/taxeditor_transformed.png -text
src/site/site.xml -text
+eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/handler/ExportSequenceToFileHandler.java -text
+eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/io/CDMSequenceMatrixAdapter.java -text
+eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/io/SequenceIDIterator.java -text
+eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/io/wizard/ExportSingleReadAlignmentWizard.java -text
+eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/io/wizard/ExportSingleReadAlignmentWizardPage.java -text
+eu.etaxonomy.taxeditor.molecular/src/test/java/eu/etaxonomy/taxeditor/molecular/io/SequenceIDIteratorTest.java -text
# The following files will be ignored when merging another
# branch into this branch in case of merge conflict and
**/pom.xml merge=ours
**/MANIFEST.MF merge=ours
**/feature.xml merge=ours
-eu.etaxonomy.taxeditor.cdmlib/.classpath merge=ours
eu.etaxonomy.taxeditor.cdmlib/build.properties merge=ours
-eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/handler/ExportSequenceToFileHandler.java -text
-eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/io/CDMSequenceMatrixAdapter.java -text
-eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/io/ExportSingleReadAlignmentWizardPage.java -text
-eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/io/SequenceIDIterator.java -text
-eu.etaxonomy.taxeditor.molecular/src/test/java/eu/etaxonomy/taxeditor/molecular/io/SequenceIDIteratorTest.java -text
-eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product merge=ours
+eu.etaxonomy.taxeditor.printpublisher/build.properties merge=ours
eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product.with.jre merge=ours
+eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product merge=ours
+
+