Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAnsgar Radermacher2013-11-04 08:31:43 -0500
committerAnsgar Radermacher2013-11-04 08:31:43 -0500
commitaaf42a430e6cb29d2935475c45d5fc77ed98501b (patch)
tree7d8c50e8b5468d3c77a4ec879f17d0a642dbb98b /extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppDocumentation.emtl
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/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppDocumentation.emtl')
-rw-r--r--extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppDocumentation.emtl4
1 files changed, 4 insertions, 0 deletions
diff --git a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppDocumentation.emtl b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppDocumentation.emtl
index f02c32f643c..c90b1a6efdf 100644
--- a/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppDocumentation.emtl
+++ b/extraplugins/codegen/org.eclipse.papyrus.cpp.codegen/src/org/eclipse/papyrus/cpp/codegen/acceleo/util/CppDocumentation.emtl
@@ -123,10 +123,14 @@
<eType xsi:type="ocl.ecore:PrimitiveType" href="http://www.eclipse.org/ocl/1.1.0/oclstdlib.ecore#/0/String"/>
<definition href="platform:/plugin/org.eclipse.papyrus.acceleo/org/eclipse/papyrus/acceleo/GenUtils.emtl#/0/getComments"/>
<<<<<<< HEAD
+<<<<<<< HEAD
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/23">
=======
<argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/33">
>>>>>>> - [Bug 420376] Generated C++ code is not formatted
+=======
+ <argument xsi:type="ocl.ecore:VariableExp" name="self" referredVariable="/33">
+>>>>>>> refs/heads/Qompass
<eType xsi:type="ecore:EClass" href="http://www.eclipse.org/uml2/4.0.0/UML#//Parameter"/>
</argument>
</source>

Back to the top