Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorptessier2014-03-13 14:36:58 +0000
committerptessier2014-03-13 14:36:58 +0000
commit1a08f4c9af22318f711e5b9e8121f1d9bdd978b8 (patch)
tree5f48e69749d25d9baf0741008a8da1344faa604c /plugins/customization/org.eclipse.papyrus.customization.properties.generation
parent2b0d2af622c6482b4a6109d12463c28f1374588a (diff)
parentda393269bea1fa51a453c731b609358c38884f1a (diff)
downloadorg.eclipse.papyrus-1a08f4c9af22318f711e5b9e8121f1d9bdd978b8.tar.gz
org.eclipse.papyrus-1a08f4c9af22318f711e5b9e8121f1d9bdd978b8.tar.xz
org.eclipse.papyrus-1a08f4c9af22318f711e5b9e8121f1d9bdd978b8.zip
Merge branch 'bugs/386118-emf-facet'
Conflicts: plugins/uml/diagram/org.eclipse.papyrus.uml.diagram.common/src/org/eclipse/papyrus/uml/diagram/common/listeners/DropTargetListener.java
Diffstat (limited to 'plugins/customization/org.eclipse.papyrus.customization.properties.generation')
-rw-r--r--plugins/customization/org.eclipse.papyrus.customization.properties.generation/META-INF/MANIFEST.MF3
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/META-INF/MANIFEST.MF b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/META-INF/MANIFEST.MF
index 3f4e78a1848..9a602a8fd51 100644
--- a/plugins/customization/org.eclipse.papyrus.customization.properties.generation/META-INF/MANIFEST.MF
+++ b/plugins/customization/org.eclipse.papyrus.customization.properties.generation/META-INF/MANIFEST.MF
@@ -26,7 +26,8 @@ Require-Bundle: org.eclipse.ui;bundle-version="3.6.1",
org.eclipse.m2m.qvt.oml.project;bundle-version="3.1.0",
org.eclipse.papyrus.customization.properties;bundle-version="1.0.0",
org.eclipse.papyrus.infra.widgets;bundle-version="1.0.0",
- org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.2.0"
+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="0.4.0",
+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="0.4.0"
Bundle-Vendor: %Bundle-Vendor
Bundle-ActivationPolicy: lazy
Bundle-ClassPath: .,

Back to the top