Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Schuetz2013-07-12 08:40:15 +0000
committerThomas Schuetz2013-07-12 08:40:15 +0000
commit12cda553738ca88662624b6f47066b5564549648 (patch)
treebfa65b6c38aa566a5f1cc98395da6546a6c6e282 /tests/org.eclipse.etrice.runtime.c.tests/.gitignore
parent3447749b1a453735ac54fc09ea7680acdbb19b69 (diff)
parentd65e1d1bdd43feadb43261b85aac2d8aef5e089c (diff)
downloadorg.eclipse.etrice-12cda553738ca88662624b6f47066b5564549648.tar.gz
org.eclipse.etrice-12cda553738ca88662624b6f47066b5564549648.tar.xz
org.eclipse.etrice-12cda553738ca88662624b6f47066b5564549648.zip
Merge remote-tracking branch 'origin/master'
Conflicts: plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.c.zip plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.modellib.java.zip plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.runtime.c.zip plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.c.zip plugins/org.eclipse.etrice.ui.runtime/contents/org.eclipse.etrice.tutorials.java.zip Change-Id: I98e2df3ab57d6e7e8f27e5b0aee7eaa189bfbc33
Diffstat (limited to 'tests/org.eclipse.etrice.runtime.c.tests/.gitignore')
-rw-r--r--tests/org.eclipse.etrice.runtime.c.tests/.gitignore16
1 files changed, 8 insertions, 8 deletions
diff --git a/tests/org.eclipse.etrice.runtime.c.tests/.gitignore b/tests/org.eclipse.etrice.runtime.c.tests/.gitignore
index 1f8db309c..df3bd5584 100644
--- a/tests/org.eclipse.etrice.runtime.c.tests/.gitignore
+++ b/tests/org.eclipse.etrice.runtime.c.tests/.gitignore
@@ -1,8 +1,8 @@
-DebugLinux
-ReleaseLinux
-DebugMinGW
-ReleaseMinGW
-bin
-output
-results
-tmp
+DebugLinux
+ReleaseLinux
+DebugMinGW
+ReleaseMinGW
+bin
+output
+results
+tmp

Back to the top