From: Patric Plitzner
Date: Wed, 26 Nov 2014 14:37:34 +0000 (+0000)
Subject: merge-update from trunk
X-Git-Tag: 3.8.0^2~59^2~97
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/26abde2f73fa0e646d8b03724ca7c034a6482728
merge-update from trunk
---
26abde2f73fa0e646d8b03724ca7c034a6482728
diff --cc .gitattributes
index 8022fc5c5,03a3a3081..52d0b6230
--- a/.gitattributes
+++ b/.gitattributes
@@@ -357,12 -357,8 +357,13 @@@ eu.etaxonomy.taxeditor.editor/icons/der
eu.etaxonomy.taxeditor.editor/icons/edit_16x16.gif -text
eu.etaxonomy.taxeditor.editor/icons/emblem-photos.png -text
eu.etaxonomy.taxeditor.editor/icons/leaf_detail.png -text
+ eu.etaxonomy.taxeditor.editor/icons/link_obj.gif -text
eu.etaxonomy.taxeditor.editor/icons/xper64.png -text
+eu.etaxonomy.taxeditor.editor/lib/biojava3-alignment-3.0.7.jar -text
+eu.etaxonomy.taxeditor.editor/lib/biojava3-core-3.0.7.jar -text
+eu.etaxonomy.taxeditor.editor/lib/commons-lang3-3.1.jar -text
+eu.etaxonomy.taxeditor.editor/lib/core-1.8.5.jar -text
+eu.etaxonomy.taxeditor.editor/lib/sequencing-1.8.5.jar -text
eu.etaxonomy.taxeditor.editor/p2.inf -text
eu.etaxonomy.taxeditor.editor/plugin.xml -text
eu.etaxonomy.taxeditor.editor/pom.xml -text
diff --cc eu.etaxonomy.taxeditor.editor/plugin.xml
index c139ebbe5,e0dc27452..1fdf2b517
--- a/eu.etaxonomy.taxeditor.editor/plugin.xml
+++ b/eu.etaxonomy.taxeditor.editor/plugin.xml
@@@ -842,57 -823,29 +842,81 @@@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
++
+
+
+
+
+
+
+
+
+
+
@@@ -1288,20 -1245,10 +1328,24 @@@
id="eu.etaxonomy.taxeditor.editor.command.new.datasource"
name="%command.name.39">
+
+
+
+
+
+
+
+
+