From: Patric Plitzner
Date: Tue, 8 Oct 2013 12:41:32 +0000 (+0000)
Subject: merge-update from trunk
X-Git-Tag: 3.6.0~841^2~89
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/4aebadc96d2ce1ab1f85323e6cc5d9cdbdf4417a?hp=bec9df5af7423ad65819c1ecc92f9f0bf61225ba
merge-update from trunk
---
diff --git a/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
index b145f9726..def207374 100644
--- a/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
@@ -8,7 +8,6 @@ Bundle-Vendor: EDIT
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
org.eclipse.help.ui,
- org.eclipse.help.webapp,
- org.hamcrest
+ org.eclipse.help.webapp
Bundle-RequiredExecutionEnvironment: JavaSE-1.6
Bundle-ActivationPolicy: lazy
diff --git a/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
index 0af0c2d14..1eacc7cf8 100644
--- a/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF
@@ -12,7 +12,6 @@ Require-Bundle: org.apache.log4j,
org.eclipse.swtbot.eclipse.core;bundle-version="2.0.5",
org.eclipse.swtbot.eclipse.finder,
org.eclipse.swtbot.junit4_x,
- org.hamcrest,
org.eclipse.ui.ide,
org.junit4,
eu.etaxonomy.taxeditor.application;bundle-version="3.0.6",