Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJuergen Haug2018-06-18 08:25:01 +0000
committerJuergen Haug2018-06-18 08:25:01 +0000
commit842d1ee0c1cb95148ba3815cc66024317e37eb2e (patch)
treee7ee889793d4cf5ec16419fbdc8a73889154361a /tests/org.eclipse.etrice.generator.java.tests
parent29873f1151bb915cf3044f21deca9c756d3f95e0 (diff)
parent3a0767800bb81a9f3f1f84024cfc3fcd5769df3f (diff)
downloadorg.eclipse.etrice-842d1ee0c1cb95148ba3815cc66024317e37eb2e.tar.gz
org.eclipse.etrice-842d1ee0c1cb95148ba3815cc66024317e37eb2e.tar.xz
org.eclipse.etrice-842d1ee0c1cb95148ba3815cc66024317e37eb2e.zip
Merge remote-tracking branch 'gerrit/master' into newfsmgen_finalize
Conflicts: plugins/org.eclipse.etrice.ui.behavior.fsm/META-INF/MANIFEST.MF plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/StateSupport.java plugins/org.eclipse.etrice.ui.behavior.fsm/src/org/eclipse/etrice/ui/behavior/fsm/support/TransitionSupport.java plugins/org.eclipse.etrice.ui.behavior/META-INF/MANIFEST.MF pom.xml releng/org.eclipse.etrice.parent/pom.xml tests/org.eclipse.etrice.generator.c.tests/.gitignore tests/org.eclipse.etrice.generator.cpp.tests/.gitignore tests/org.eclipse.etrice.generator.java.tests/.gitignore Change-Id: I048e62574a0bca94bf86ed19bba6ed4325a37e81
Diffstat (limited to 'tests/org.eclipse.etrice.generator.java.tests')
-rw-r--r--tests/org.eclipse.etrice.generator.java.tests/.gitignore8
1 files changed, 2 insertions, 6 deletions
diff --git a/tests/org.eclipse.etrice.generator.java.tests/.gitignore b/tests/org.eclipse.etrice.generator.java.tests/.gitignore
index 04ab4331e..e13c0a3a4 100644
--- a/tests/org.eclipse.etrice.generator.java.tests/.gitignore
+++ b/tests/org.eclipse.etrice.generator.java.tests/.gitignore
@@ -1,10 +1,6 @@
src-gen/
bin
-models
+models/*
output
results
-src-gen
-log
-/tmp/
-/firstOpt.obj
-/secondOpt.obj
+*.obj

Back to the top