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 /releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly | |
| 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 'releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly')
| -rw-r--r-- | releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.rmap | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.rmap b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.rmap index 7475077d6b6..1009ed3e3a9 100644 --- a/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.rmap +++ b/releng/org.eclipse.mdt.papyrus.releng.buckminster/papyrus-trunk-nightly/build.rmap @@ -300,6 +300,13 @@ </rm:uri>
</rm:provider>
+ <!-- PAYURYS EMF FACET-->
+ <rm:provider componentTypes="osgi.bundle" readerType="local">
+ <rm:uri format="{0}/plugins/facet/{1}">
+ <bc:propertyRef key="local.repository"/>
+ <bc:propertyRef key="buckminster.component"/>
+ </rm:uri>
+ </rm:provider>
<!-- EPF -->
<rm:provider componentTypes="osgi.bundle" readerType="local">
|