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.launch.java/META-INF/MANIFEST.MF
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.launch.java/META-INF/MANIFEST.MF')
-rw-r--r--plugins/org.eclipse.etrice.generator.launch.java/META-INF/MANIFEST.MF42
1 files changed, 21 insertions, 21 deletions
diff --git a/plugins/org.eclipse.etrice.generator.launch.java/META-INF/MANIFEST.MF b/plugins/org.eclipse.etrice.generator.launch.java/META-INF/MANIFEST.MF
index 9771ddcb8..482a5715d 100644
--- a/plugins/org.eclipse.etrice.generator.launch.java/META-INF/MANIFEST.MF
+++ b/plugins/org.eclipse.etrice.generator.launch.java/META-INF/MANIFEST.MF
@@ -1,21 +1,21 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: eTrice Java Generator Launch
-Bundle-SymbolicName: org.eclipse.etrice.generator.launch.java;singleton:=true
-Bundle-Version: 0.1.0.qualifier
-Bundle-Activator: org.eclipse.etrice.generator.launch.java.Activator
-Require-Bundle: org.eclipse.etrice.generator;bundle-version="0.1.0",
- org.eclipse.etrice.generator.java;bundle-version="0.1.0",
- org.eclipse.etrice.generator.launch;bundle-version="0.1.0",
- org.eclipse.ui,
- org.eclipse.core.runtime,
- org.eclipse.debug.core,
- org.eclipse.debug.ui,
- org.eclipse.jdt.ui;bundle-version="3.7.0",
- org.eclipse.jdt.core;bundle-version="3.7.0",
- org.eclipse.core.variables;bundle-version="3.2.500"
-Bundle-ActivationPolicy: lazy
-Bundle-RequiredExecutionEnvironment: JavaSE-1.6
-Import-Package: org.eclipse.jdt.launching,
- org.eclipse.ui.dialogs
-Bundle-Vendor: eTrice (Incubation)
+Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: eTrice Java Generator Launch
+Bundle-SymbolicName: org.eclipse.etrice.generator.launch.java;singleton:=true
+Bundle-Version: 0.1.0.qualifier
+Bundle-Activator: org.eclipse.etrice.generator.launch.java.Activator
+Require-Bundle: org.eclipse.etrice.generator;bundle-version="0.1.0",
+ org.eclipse.etrice.generator.java;bundle-version="0.1.0",
+ org.eclipse.etrice.generator.launch;bundle-version="0.1.0",
+ org.eclipse.ui,
+ org.eclipse.core.runtime,
+ org.eclipse.debug.core,
+ org.eclipse.debug.ui,
+ org.eclipse.jdt.ui;bundle-version="3.7.0",
+ org.eclipse.jdt.core;bundle-version="3.7.0",
+ org.eclipse.core.variables;bundle-version="3.2.500"
+Bundle-ActivationPolicy: lazy
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6
+Import-Package: org.eclipse.jdt.launching,
+ org.eclipse.ui.dialogs
+Bundle-Vendor: eTrice (Incubation)

Back to the top