diff options
| author | Christian W. Damus | 2014-02-24 15:54:33 +0000 |
|---|---|---|
| committer | Christian W. Damus | 2014-02-24 15:54:33 +0000 |
| commit | 0f98a2364665f9d25bbe9015c854838d5e5d692f (patch) | |
| tree | 4ae536166a77dafce91f9f2fb2128b558afca666 | |
| parent | 3423647e5ed7317505d7729680c5117a1874094b (diff) | |
| parent | c74782ce2b729e58e553e86bcd62351b385add2b (diff) | |
| download | org.eclipse.papyrus-0f98a2364665f9d25bbe9015c854838d5e5d692f.tar.gz org.eclipse.papyrus-0f98a2364665f9d25bbe9015c854838d5e5d692f.tar.xz org.eclipse.papyrus-0f98a2364665f9d25bbe9015c854838d5e5d692f.zip | |
Merge branch 'refs/heads/master' into bugs/323802-readonly
3 files changed, 18 insertions, 2 deletions
diff --git a/features/papyrus-tests-features/org.eclipse.papyrus.tests.feature/feature.xml b/features/papyrus-tests-features/org.eclipse.papyrus.tests.feature/feature.xml index f5e84893ace..9e4b255e711 100644 --- a/features/papyrus-tests-features/org.eclipse.papyrus.tests.feature/feature.xml +++ b/features/papyrus-tests-features/org.eclipse.papyrus.tests.feature/feature.xml @@ -56,6 +56,22 @@ http://www.eclipse.org/legal/epl-v10.html id="org.eclipse.papyrus.tests.uml.nattable.feature"
version="0.0.0"/>
+ <includes
+ id="org.eclipse.papyrus.tests.infra.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.papyrus.tests.infra.core.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.papyrus.tests.infra.queries.feature"
+ version="0.0.0"/>
+
+ <includes
+ id="org.eclipse.papyrus.tests.uml.tools.feature"
+ version="0.0.0"/>
+
<plugin
id="org.eclipse.papyrus.tests"
download-size="0"
diff --git a/features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.core.feature/feature.xml b/features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.core.feature/feature.xml index 6edb28681f4..a740052d0c2 100644 --- a/features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.core.feature/feature.xml +++ b/features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.core.feature/feature.xml @@ -14,6 +14,6 @@ http://www.eclipse.org/legal/epl-v10.html <license url="%licenseURL">
%license
</license>
- <plugin download-size="0" fragment="true" id="org.eclipse.papyrus.core.tests" install-size="0" unpack="false" version="0.0.0"/>
+ <plugin download-size="0" fragment="true" id="org.eclipse.papyrus.infra.core.tests" install-size="0" unpack="false" version="0.0.0"/>
</feature>
\ No newline at end of file diff --git a/features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.feature/feature.xml b/features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.feature/feature.xml index 8042bdcb502..365d20cb82a 100644 --- a/features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.feature/feature.xml +++ b/features/papyrus-tests-features/org.eclipse.papyrus.tests.infra.feature/feature.xml @@ -51,4 +51,4 @@ http://www.eclipse.org/legal/epl-v10.html fragment="true" unpack="false"/> -</feature>
\ No newline at end of file +</feature> |