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 /extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui
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 'extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui')
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/META-INF/MANIFEST.MF3
1 files changed, 2 insertions, 1 deletions
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/META-INF/MANIFEST.MF b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/META-INF/MANIFEST.MF
index 106d45464be..c8facb34362 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/META-INF/MANIFEST.MF
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen.ui/META-INF/MANIFEST.MF
@@ -11,7 +11,8 @@ Require-Bundle: org.eclipse.ui,
org.eclipse.papyrus.acceleo;bundle-version="0.10.1",
org.eclipse.cdt.core;bundle-version="5.5.0",
org.eclipse.papyrus.acceleo.ui;bundle-version="0.10.1",
- org.eclipse.papyrus.infra.core.log;bundle-version="0.10.1"
+ org.eclipse.papyrus.infra.core.log;bundle-version="0.10.1",
+ org.eclipse.papyrus.acceleo.ui;bundle-version="0.10.1"
Bundle-Vendor: %providerName
Bundle-ActivationPolicy: lazy
Bundle-Version: 0.10.1.qualifier

Back to the top