Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authortjung2012-04-22 12:32:36 -0400
committertjung2012-04-22 12:32:36 -0400
commitaae84264e45e5da09665bf0090d46e9ff6eafa27 (patch)
tree1f8087aa54f0afe880624063e3c2d238220dcc2e /features
parent429f6ff06741a55b97f0e926ba61b232e9b3f1fa (diff)
parent21ce8b7a3b5c5996810a8e7b914ee2b97a2f0803 (diff)
downloadorg.eclipse.etrice-aae84264e45e5da09665bf0090d46e9ff6eafa27.tar.gz
org.eclipse.etrice-aae84264e45e5da09665bf0090d46e9ff6eafa27.tar.xz
org.eclipse.etrice-aae84264e45e5da09665bf0090d46e9ff6eafa27.zip
Merge branch 'master' of ssh://git.eclipse.org/gitroot/etrice/org.eclipse.etrice
Conflicts: features/org.eclipse.etrice.feature/feature.xml
Diffstat (limited to 'features')
-rw-r--r--features/org.eclipse.etrice.feature/feature.xml4
1 files changed, 4 insertions, 0 deletions
diff --git a/features/org.eclipse.etrice.feature/feature.xml b/features/org.eclipse.etrice.feature/feature.xml
index 4ba6fd725..0c03a2a69 100644
--- a/features/org.eclipse.etrice.feature/feature.xml
+++ b/features/org.eclipse.etrice.feature/feature.xml
@@ -196,6 +196,7 @@ http://www.eclipse.org/legal/epl-v10.html
unpack="false"/>
<plugin
+<<<<<<< HEAD
id="org.eclipse.etrice.generator.c"
download-size="0"
install-size="0"
@@ -204,6 +205,9 @@ http://www.eclipse.org/legal/epl-v10.html
<plugin
id="org.eclipse.etrice.generator.launch.c"
+=======
+ id="org.eclipse.etrice.etunit.converter"
+>>>>>>> 21ce8b7a3b5c5996810a8e7b914ee2b97a2f0803
download-size="0"
install-size="0"
version="0.0.0"

Back to the top