Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnsgar Radermacher2013-11-04 13:31:43 +0000
committerAnsgar Radermacher2013-11-04 13:31:43 +0000
commitaaf42a430e6cb29d2935475c45d5fc77ed98501b (patch)
tree7d8c50e8b5468d3c77a4ec879f17d0a642dbb98b /features
parentc3e33d3babb34f6948200b9a06fa428edf675d15 (diff)
parentee77297e3ec2e434a3dc89f1e23221a995398674 (diff)
downloadorg.eclipse.papyrus-aaf42a430e6cb29d2935475c45d5fc77ed98501b.tar.gz
org.eclipse.papyrus-aaf42a430e6cb29d2935475c45d5fc77ed98501b.tar.xz
org.eclipse.papyrus-aaf42a430e6cb29d2935475c45d5fc77ed98501b.zip
Merge branch 'Qompass'
Conflicts: extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/META-INF/MANIFEST.MF extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/CppClassHeader.emtl extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppDocumentation.emtl extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/clazz/CppClassTypeAndEnum.emtl extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/operation/CppOperations.emtl
Diffstat (limited to 'features')
-rw-r--r--features/papyrus-extra-features/org.eclipse.papyrus.extra.cpp.feature/feature.xml14
1 files changed, 14 insertions, 0 deletions
diff --git a/features/papyrus-extra-features/org.eclipse.papyrus.extra.cpp.feature/feature.xml b/features/papyrus-extra-features/org.eclipse.papyrus.extra.cpp.feature/feature.xml
index 808e1ace6d5..efb378923d8 100644
--- a/features/papyrus-extra-features/org.eclipse.papyrus.extra.cpp.feature/feature.xml
+++ b/features/papyrus-extra-features/org.eclipse.papyrus.extra.cpp.feature/feature.xml
@@ -61,6 +61,20 @@ http://www.eclipse.org/legal/epl-v10.html
unpack="false"/>
<plugin
+ id="org.eclipse.papyrus.acceleo.debug"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
+ id="org.eclipse.papyrus.acceleo.ui"
+ download-size="0"
+ install-size="0"
+ version="0.0.0"
+ unpack="false"/>
+
+ <plugin
id="org.eclipse.papyrus.texteditor.cdt"
download-size="0"
install-size="0"

Back to the top