diff options
| author | ptessier | 2014-03-13 14:36:58 +0000 |
|---|---|---|
| committer | ptessier | 2014-03-13 14:36:58 +0000 |
| commit | 1a08f4c9af22318f711e5b9e8121f1d9bdd978b8 (patch) | |
| tree | 5f48e69749d25d9baf0741008a8da1344faa604c /plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration | |
| parent | 2b0d2af622c6482b4a6109d12463c28f1374588a (diff) | |
| parent | da393269bea1fa51a453c731b609358c38884f1a (diff) | |
| download | org.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/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration')
| -rw-r--r-- | plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/META-INF/MANIFEST.MF | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/META-INF/MANIFEST.MF b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/META-INF/MANIFEST.MF index 3d1bbaf1ca2..44438439ce9 100644 --- a/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/META-INF/MANIFEST.MF +++ b/plugins/infra/gmfdiag/css/org.eclipse.papyrus.infra.gmfdiag.css.configuration/META-INF/MANIFEST.MF @@ -14,9 +14,10 @@ Require-Bundle: org.eclipse.ui, org.eclipse.papyrus.infra.gmfdiag.css.model;bundle-version="1.0.0",
org.eclipse.papyrus.infra.gmfdiag.css;bundle-version="1.0.0",
org.eclipse.papyrus.infra.emf.appearance;bundle-version="1.0.0",
- org.eclipse.emf.facet.infra.browser.uicore;bundle-version="0.2.0",
org.eclipse.papyrus.infra.services.labelprovider;bundle-version="1.0.0",
- org.eclipse.e4.ui.css.core;bundle-version="0.10.2"
+ org.eclipse.e4.ui.css.core;bundle-version="0.10.2",
+ org.eclipse.papyrus.emf.facet.custom.core;bundle-version="0.4.0",
+ org.eclipse.papyrus.emf.facet.custom.ui;bundle-version="0.4.0"
Export-Package: org.eclipse.papyrus.infra.gmfdiag.css.configuration.ha
ndler
Bundle-Vendor: Eclipse Modeling Project
|