Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorrschnekenbu2014-02-16 21:55:39 +0000
committerrschnekenbu2014-02-16 22:01:07 +0000
commitf1ab824e60ae6f3b1201db9c9ab08db344371d2e (patch)
tree044094febf75481aaa77fbc35fe5f1f8781358a7 /plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf
parent5be40091c4ef545220ba241797265ffd9b1cc76e (diff)
parent460dfc77532b3471d72d9a1cd263de8866b9b8e6 (diff)
downloadorg.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 'plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf')
-rw-r--r--plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/META-INF/MANIFEST.MF1
1 files changed, 0 insertions, 1 deletions
diff --git a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/META-INF/MANIFEST.MF b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/META-INF/MANIFEST.MF
index 2934ff94f16..0bfa05d111f 100644
--- a/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/META-INF/MANIFEST.MF
+++ b/plugins/infra/org.eclipse.papyrus.infra.extendedtypes.emf/META-INF/MANIFEST.MF
@@ -15,7 +15,6 @@ Require-Bundle: org.eclipse.core.runtime;bundle-version="3.7.0",
org.eclipse.uml2.types,
org.eclipse.emf.edit,
org.eclipse.emf.ecore.edit,
- org.eclipse.papyrus.infra.extendedtypes.edit;bundle-version="1.0.0",
org.eclipse.uml2.uml.edit,
org.eclipse.papyrus.infra.core.log;bundle-version="1.0.0",
org.eclipse.ui;bundle-version="3.7.0",

Back to the top