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/plugin.xml
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/plugin.xml')
-rw-r--r--plugins/org.eclipse.etrice.generator.c/plugin.xml42
1 files changed, 21 insertions, 21 deletions
diff --git a/plugins/org.eclipse.etrice.generator.c/plugin.xml b/plugins/org.eclipse.etrice.generator.c/plugin.xml
index d3f5e1d66..4fbc72de2 100644
--- a/plugins/org.eclipse.etrice.generator.c/plugin.xml
+++ b/plugins/org.eclipse.etrice.generator.c/plugin.xml
@@ -1,21 +1,21 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<?eclipse version="3.4"?>
-<plugin>
-
- <extension point="org.eclipse.ui.newWizards">
- <category
- id="org.eclipse.etrice.core.ui.wizardCategory"
- name="eTrice"/>
- <wizard
- id="org.eclipse.etrice.generator.java.newwizard.EmptyProjectWizard"
- name="Empty eTrice Java Project"
- class="org.eclipse.etrice.generator.c.newwizard.EmptyProjectWizard"
- category="org.eclipse.etrice.core.ui.wizardCategory"
- project="true"
- icon="icons/NewETriceProject.gif">
- <description>Create an empty Java plug-in project with eTrice dependencies</description>
- <selection class="org.eclipse.core.resources.IResource"/>
- </wizard>
- </extension>
-
-</plugin>
+<?xml version="1.0" encoding="UTF-8"?>
+<?eclipse version="3.4"?>
+<plugin>
+
+ <extension point="org.eclipse.ui.newWizards">
+ <category
+ id="org.eclipse.etrice.core.ui.wizardCategory"
+ name="eTrice"/>
+ <wizard
+ id="org.eclipse.etrice.generator.java.newwizard.EmptyProjectWizard"
+ name="Empty eTrice Java Project"
+ class="org.eclipse.etrice.generator.c.newwizard.EmptyProjectWizard"
+ category="org.eclipse.etrice.core.ui.wizardCategory"
+ project="true"
+ icon="icons/NewETriceProject.gif">
+ <description>Create an empty Java plug-in project with eTrice dependencies</description>
+ <selection class="org.eclipse.core.resources.IResource"/>
+ </wizard>
+ </extension>
+
+</plugin>

Back to the top