diff options
| author | Juergen Haug | 2012-12-12 15:14:00 +0000 |
|---|---|---|
| committer | Juergen Haug | 2012-12-12 15:14:00 +0000 |
| commit | 5d9b58598e7ca37940afb777337975f4afad4dbf (patch) | |
| tree | ba83942b8814e1658a73b7b243e9982f72441fab /tests/org.eclipse.etrice.generator.c.tests | |
| parent | 72802f3f5250f6632ed0a4e6dc3bedcb9c5ffee4 (diff) | |
| parent | 7d084613b6dc6ea496e51f70e511126081cdd307 (diff) | |
| download | org.eclipse.etrice-5d9b58598e7ca37940afb777337975f4afad4dbf.tar.gz org.eclipse.etrice-5d9b58598e7ca37940afb777337975f4afad4dbf.tar.xz org.eclipse.etrice-5d9b58598e7ca37940afb777337975f4afad4dbf.zip | |
Merge remote-tracking branch 'origin/master' into change/8995/1
Conflicts:
plugins/org.eclipse.etrice.generator.java/src/org/eclipse/etrice/generator/java/gen/ConfigGenAddon.xtend
plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ConfigGenAddon.java
plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip
plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip
plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip
plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.java.zip
plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.java.zip
Change-Id: Iec86201d19ab068e6f2eb9b667e05d3bc3e78786
Diffstat (limited to 'tests/org.eclipse.etrice.generator.c.tests')
| -rw-r--r-- | tests/org.eclipse.etrice.generator.c.tests/buckminster.cspec | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/tests/org.eclipse.etrice.generator.c.tests/buckminster.cspec b/tests/org.eclipse.etrice.generator.c.tests/buckminster.cspec index a4ef60acf..562d565a3 100644 --- a/tests/org.eclipse.etrice.generator.c.tests/buckminster.cspec +++ b/tests/org.eclipse.etrice.generator.c.tests/buckminster.cspec @@ -1,5 +1,4 @@ -<?xml version="1.0" encoding="UTF-8"?>
-<cs:cspec xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0" name="org.eclipse.etrice.generator.c.tests" componentType="buckminster" version="0.0.2">
+<?xml version="1.0" encoding="UTF-8"?><cs:cspec xmlns:cs="http://www.eclipse.org/buckminster/CSpec-1.0" name="org.eclipse.etrice.generator.c.tests" componentType="buckminster" version="0.3.0.qualifier">
<cs:actions>
<cs:public name="run_tests" actor="ant">
<cs:actorProperties>
|