diff options
| author | Henrik Rentz-Reichert | 2012-02-02 10:09:22 +0000 |
|---|---|---|
| committer | Henrik Rentz-Reichert | 2012-02-02 10:09:22 +0000 |
| commit | 0de5eb081f268c234947d86994102fa3a8ce864a (patch) | |
| tree | 58bbb67c81c4d2d1c41909d92e6d1fc820f187a3 /plugins/org.eclipse.etrice.generator.c/.project | |
| parent | b55690aca6ad5d17e699e809af481d1ffd04191e (diff) | |
| parent | cfe46b9799947e484ed42a2eefded0db55d43904 (diff) | |
| download | org.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/.project')
| -rw-r--r-- | plugins/org.eclipse.etrice.generator.c/.project | 90 |
1 files changed, 45 insertions, 45 deletions
diff --git a/plugins/org.eclipse.etrice.generator.c/.project b/plugins/org.eclipse.etrice.generator.c/.project index 0bbb7217b..726568e6c 100644 --- a/plugins/org.eclipse.etrice.generator.c/.project +++ b/plugins/org.eclipse.etrice.generator.c/.project @@ -1,45 +1,45 @@ -<?xml version="1.0" encoding="UTF-8"?> -<projectDescription> - <name>org.eclipse.etrice.generator.c</name> - <comment></comment> - <projects> - </projects> - <buildSpec> - <buildCommand> - <name>org.eclipse.jdt.core.javabuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.ManifestBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.pde.SchemaBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.xtext.ui.shared.xtextBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.xtend.typesystem.xsd.ui.xsdBuilder</name> - <arguments> - </arguments> - </buildCommand> - <buildCommand> - <name>org.eclipse.xtend.shared.ui.xtendBuilder</name> - <arguments> - </arguments> - </buildCommand> - </buildSpec> - <natures> - <nature>org.eclipse.jdt.core.javanature</nature> - <nature>org.eclipse.pde.PluginNature</nature> - <nature>org.eclipse.xtext.ui.shared.xtextNature</nature> - <nature>org.eclipse.xtend.shared.ui.xtendXPandNature</nature> - </natures> -</projectDescription> +<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>org.eclipse.etrice.generator.c</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.ManifestBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.pde.SchemaBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.xtext.ui.shared.xtextBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.xtend.typesystem.xsd.ui.xsdBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.xtend.shared.ui.xtendBuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.pde.PluginNature</nature>
+ <nature>org.eclipse.xtext.ui.shared.xtextNature</nature>
+ <nature>org.eclipse.xtend.shared.ui.xtendXPandNature</nature>
+ </natures>
+</projectDescription>
|