merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Mon, 27 Oct 2014 13:45:51 +0000 (13:45 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Mon, 27 Oct 2014 13:45:51 +0000 (13:45 +0000)
commit26254193b965dc0bb91a50b162b9e091c298e63f
tree3e7145ec37d32bcc3870045343eb68d2950a4857
parent136543c0d74426f27817f6cb54f8b67b1ef402d6
parent7c6e83fe0ab93017b619b75580da1c585193b2b2
merge-update from trunk
.gitattributes
eu.etaxonomy.taxeditor.editor/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.editor/plugin.xml
eu.etaxonomy.taxeditor.editor/src/main/java/eu/etaxonomy/taxeditor/editor/molecular/AlignmentEditor.java