diff options
| author | Henrik Rentz-Reichert | 2012-02-27 16:03:29 +0000 |
|---|---|---|
| committer | Henrik Rentz-Reichert | 2012-02-27 16:03:29 +0000 |
| commit | 9b63ec1b9654dd00d644ceb94f664df3e61d6c4e (patch) | |
| tree | 3607453cd83d3e2963fd2a415a84289931d29e22 /examples/org.eclipse.etrice.generator.c.reference/src/test/experiments/SubSystem.c | |
| parent | 1b19f7079ee48921ad2fb0169eb73d537f9eab1e (diff) | |
| parent | fa4a03389b5596fbaa65d5acb0e198013c1820a8 (diff) | |
| download | org.eclipse.etrice-9b63ec1b9654dd00d644ceb94f664df3e61d6c4e.tar.gz org.eclipse.etrice-9b63ec1b9654dd00d644ceb94f664df3e61d6c4e.tar.xz org.eclipse.etrice-9b63ec1b9654dd00d644ceb94f664df3e61d6c4e.zip | |
Merge remote branch 'refs/remotes/origin/master'
Conflicts:
plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ActorClassGen.java
plugins/org.eclipse.etrice.generator.c/xtend-gen/org/eclipse/etrice/generator/c/gen/ProtocolClassGen.java
plugins/org.eclipse.etrice.generator/xtend-gen/org/eclipse/etrice/generator/generic/GenericProtocolClassGenerator.java
Diffstat (limited to 'examples/org.eclipse.etrice.generator.c.reference/src/test/experiments/SubSystem.c')
| -rw-r--r-- | examples/org.eclipse.etrice.generator.c.reference/src/test/experiments/SubSystem.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/examples/org.eclipse.etrice.generator.c.reference/src/test/experiments/SubSystem.c b/examples/org.eclipse.etrice.generator.c.reference/src/test/experiments/SubSystem.c index b9c769bf0..5a529aa03 100644 --- a/examples/org.eclipse.etrice.generator.c.reference/src/test/experiments/SubSystem.c +++ b/examples/org.eclipse.etrice.generator.c.reference/src/test/experiments/SubSystem.c @@ -10,7 +10,7 @@ *
*******************************************************************************/
-#include "etLogger.h"
+#include "debugging/etLogger.h"
typedef struct SubSystem {
char *name;
|