Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Haug2012-11-23 07:29:02 -0500
committerJuergen Haug2012-11-23 07:29:02 -0500
commit4aa11d8fbc45298bbb134e678217b981dee301b4 (patch)
tree6efb6ac2ee427e854b26346f1b83ec23b084fc28 /plugins/org.eclipse.etrice.generator.c/META-INF
parent50fcc9f9b85408eb13037b6cfad0af69d756f495 (diff)
parentc3a077700afda0406bb5745a6f9a30e75d48905f (diff)
downloadorg.eclipse.etrice-4aa11d8fbc45298bbb134e678217b981dee301b4.tar.gz
org.eclipse.etrice-4aa11d8fbc45298bbb134e678217b981dee301b4.tar.xz
org.eclipse.etrice-4aa11d8fbc45298bbb134e678217b981dee301b4.zip
Merge branch 'master' of
ssh://jhaug@git.eclipse.org:29418/etrice/org.eclipse.etrice.git Conflicts: plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.xtend plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/SubSystemClassGen.java plugins/org.eclipse.etrice.generator.config/src/org/eclipse/etrice/generator/config/DataConfiguration.xtend plugins/org.eclipse.etrice.generator.config/xtend-gen/org/eclipse/etrice/generator/config/.DataConfiguration.java._trace Change-Id: Idb15029b0a22ab872f58c1cee1457452daff46c5
Diffstat (limited to 'plugins/org.eclipse.etrice.generator.c/META-INF')
-rw-r--r--plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF10
1 files changed, 5 insertions, 5 deletions
diff --git a/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF
index 412e494ab..f91e8ba53 100644
--- a/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF
@@ -2,13 +2,13 @@ Manifest-Version: 1.0
Bundle-ManifestVersion: 2
Bundle-Name: eTrice C Generator
Bundle-Vendor: eTrice (Incubation)
-Bundle-Version: 0.2.0.qualifier
+Bundle-Version: 0.3.0.qualifier
Bundle-SymbolicName: org.eclipse.etrice.generator.c;singleton:=true
Bundle-ActivationPolicy: lazy
-Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="0.2.0",
- org.eclipse.etrice.core.genmodel;bundle-version="0.2.0",
- org.eclipse.etrice.generator;bundle-version="0.2.0",
- org.eclipse.etrice.generator.doc;bundle-version="0.2.0",
+Require-Bundle: org.eclipse.etrice.core.room.ui;bundle-version="0.3.0",
+ org.eclipse.etrice.core.genmodel;bundle-version="0.3.0",
+ org.eclipse.etrice.generator;bundle-version="0.3.0",
+ org.eclipse.etrice.generator.doc;bundle-version="0.3.0",
org.eclipse.core.resources;bundle-version="3.6.0",
org.eclipse.core.runtime;bundle-version="3.6.0",
org.eclipse.ui;bundle-version="3.7.0",

Back to the top