Merge branch 'LibrAlign' of https://dev.e-taxonomy.eu/git/taxeditor into LibrAlign
authorb.stoever <stoever@bioinfweb.info>
Wed, 26 Oct 2016 15:31:21 +0000 (17:31 +0200)
committerb.stoever <stoever@bioinfweb.info>
Wed, 26 Oct 2016 15:31:21 +0000 (17:31 +0200)
commitc80496ea537bd9c10955302bd56cde61c3d043d3
treeee327b81ac74e1080dd77d15699de515f50a2d64
parentc37c85061f9b76949821842a648af5a0271c3611
parentc6476daa5094f992b235fd7c4d10c17b90dc0e8b
Merge branch 'LibrAlign' of https://dev.e-taxonomy.eu/git/taxeditor into LibrAlign

# Conflicts:
# eu.etaxonomy.taxeditor.molecular.lib/.classpath
# eu.etaxonomy.taxeditor/rcp.target
.gitignore
eu.etaxonomy.taxeditor.molecular.lib/.classpath
eu.etaxonomy.taxeditor.molecular.lib/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/editor/AlignmentEditor.java
eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/handler/AbstractPherogramComponentHandler.java
eu.etaxonomy.taxeditor.molecular/src/main/java/eu/etaxonomy/taxeditor/molecular/handler/AlignmentEditorPasteHandler.java
eu.etaxonomy.taxeditor/eu.etaxonomy.taxeditor.product
eu.etaxonomy.taxeditor/rcp.target