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 /tests/org.eclipse.etrice.runtime.java.tests
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 'tests/org.eclipse.etrice.runtime.java.tests')
-rw-r--r--tests/org.eclipse.etrice.runtime.java.tests/tmp/log/.gitignore2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/org.eclipse.etrice.runtime.java.tests/tmp/log/.gitignore b/tests/org.eclipse.etrice.runtime.java.tests/tmp/log/.gitignore
index 768a95400..74295d032 100644
--- a/tests/org.eclipse.etrice.runtime.java.tests/tmp/log/.gitignore
+++ b/tests/org.eclipse.etrice.runtime.java.tests/tmp/log/.gitignore
@@ -1 +1 @@
-/*.seq
+/*.seq

Back to the top