merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Tue, 8 Oct 2013 12:41:32 +0000 (12:41 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Tue, 8 Oct 2013 12:41:32 +0000 (12:41 +0000)
eu.etaxonomy.taxeditor.help/META-INF/MANIFEST.MF
eu.etaxonomy.taxeditor.test/META-INF/MANIFEST.MF

index b145f9726b1c4b0e170dc167a59ad90b1e9096f9..def207374813168e6b6eaca93e5299095aacb35f 100644 (file)
@@ -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
index 0af0c2d141c943b4af3feb37552bcc5308c65818..1eacc7cf85ac35ea51feb7766357d5bd821f4f07 100644 (file)
@@ -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",