Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHenrik Rentz-Reichert2012-02-02 05:09:22 -0500
committerHenrik Rentz-Reichert2012-02-02 05:09:22 -0500
commit0de5eb081f268c234947d86994102fa3a8ce864a (patch)
tree58bbb67c81c4d2d1c41909d92e6d1fc820f187a3 /plugins/org.eclipse.etrice.generator.c/META-INF
parentb55690aca6ad5d17e699e809af481d1ffd04191e (diff)
parentcfe46b9799947e484ed42a2eefded0db55d43904 (diff)
downloadorg.eclipse.etrice-0de5eb081f268c234947d86994102fa3a8ce864a.tar.gz
org.eclipse.etrice-0de5eb081f268c234947d86994102fa3a8ce864a.tar.xz
org.eclipse.etrice-0de5eb081f268c234947d86994102fa3a8ce864a.zip
Merge remote branch 'refs/remotes/origin/master'
Conflicts: plugins/org.eclipse.etrice.generator.c/src/org/eclipse/etrice/generator/c/gen/ActorClassGen.xtend plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ActorClassGen.java plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/ActorClassGen.java plugins/org.eclipse.etrice.generator.java/xtend-gen/org/eclipse/etrice/generator/java/gen/StateMachineGen.java plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/extensions/RoomExtensions.java
Diffstat (limited to 'plugins/org.eclipse.etrice.generator.c/META-INF')
-rw-r--r--plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF38
1 files changed, 19 insertions, 19 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 43c6eb2af..b4da0a598 100644
--- a/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.c/META-INF/MANIFEST.MF
@@ -1,19 +1,19 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: eTrice C Generator
-Bundle-Vendor: eTrice (Incubation)
-Bundle-Version: 0.1.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.1.0",
- org.eclipse.etrice.generator;bundle-version="0.1.0",
- org.eclipse.emf.mwe2.launch;bundle-version="1.0.1";resolution:=optional,
- 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",
- org.eclipse.ui.ide;bundle-version="3.7.0",
- org.eclipse.xtext.xtend2.lib;bundle-version="2.1.1",
- org.eclipse.etrice.generator.doc;bundle-version="0.1.0"
-Import-Package: org.apache.log4j
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Export-Package: org.eclipse.etrice.generator.c
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: eTrice C Generator
+Bundle-Vendor: eTrice (Incubation)
+Bundle-Version: 0.1.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.1.0",
+ org.eclipse.etrice.generator;bundle-version="0.1.0",
+ org.eclipse.emf.mwe2.launch;bundle-version="1.0.1";resolution:=optional,
+ 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",
+ org.eclipse.ui.ide;bundle-version="3.7.0",
+ org.eclipse.xtext.xtend2.lib;bundle-version="2.1.1",
+ org.eclipse.etrice.generator.doc;bundle-version="0.1.0"
+Import-Package: org.apache.log4j
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Export-Package: org.eclipse.etrice.generator.c

Back to the top