diff options
| author | rschnekenbu | 2014-02-16 21:55:39 +0000 |
|---|---|---|
| committer | rschnekenbu | 2014-02-16 22:01:07 +0000 |
| commit | f1ab824e60ae6f3b1201db9c9ab08db344371d2e (patch) | |
| tree | 044094febf75481aaa77fbc35fe5f1f8781358a7 /tests/junit/extraplugins/org.eclipse.papyrus.tests.extra/META-INF/MANIFEST.MF | |
| parent | 5be40091c4ef545220ba241797265ffd9b1cc76e (diff) | |
| parent | 460dfc77532b3471d72d9a1cd263de8866b9b8e6 (diff) | |
| download | org.eclipse.papyrus-f1ab824e60ae6f3b1201db9c9ab08db344371d2e.tar.gz org.eclipse.papyrus-f1ab824e60ae6f3b1201db9c9ab08db344371d2e.tar.xz org.eclipse.papyrus-f1ab824e60ae6f3b1201db9c9ab08db344371d2e.zip | |
Merge branch 'master' into committers/rschnekenbu/master/extendedtypes
Conflicts:
plugins/sysml/diagram/org.eclipse.papyrus.sysml.diagram.common/META-INF/MANIFEST.MF
Diffstat (limited to 'tests/junit/extraplugins/org.eclipse.papyrus.tests.extra/META-INF/MANIFEST.MF')
| -rw-r--r-- | tests/junit/extraplugins/org.eclipse.papyrus.tests.extra/META-INF/MANIFEST.MF | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/tests/junit/extraplugins/org.eclipse.papyrus.tests.extra/META-INF/MANIFEST.MF b/tests/junit/extraplugins/org.eclipse.papyrus.tests.extra/META-INF/MANIFEST.MF index e7c905da4a8..2844ae19c38 100644 --- a/tests/junit/extraplugins/org.eclipse.papyrus.tests.extra/META-INF/MANIFEST.MF +++ b/tests/junit/extraplugins/org.eclipse.papyrus.tests.extra/META-INF/MANIFEST.MF @@ -1,7 +1,6 @@ Manifest-Version: 1.0
Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime,
- org.eclipse.papyrus.infra.gmfdiag.css.tests;bundle-version="1.0.0",
org.eclipse.papyrus.bundles.tests;bundle-version="1.0.0",
org.junit;bundle-version="4.10.0",
org.eclipse.papyrus.cdo.core.tests;bundle-version="1.0.0",
|