Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Schindl2016-03-16 10:21:42 -0400
committerTom Schindl2016-03-16 10:21:42 -0400
commitc012411794c3f0ae66df270d4f9b7affb895a3ad (patch)
tree56386c8134312736edfb6ac5769f0f89fc2acffc /demos/org.eclipse.fx.testcases.dnd.app.jemmy
parent63f338ab515119116616568c317c80a15dd72b48 (diff)
parentaa71c74f50697dada863b88cdbb5debd9f3334b1 (diff)
downloadorg.eclipse.efxclipse-c012411794c3f0ae66df270d4f9b7affb895a3ad.tar.gz
org.eclipse.efxclipse-c012411794c3f0ae66df270d4f9b7affb895a3ad.tar.xz
org.eclipse.efxclipse-c012411794c3f0ae66df270d4f9b7affb895a3ad.zip
Merge branch 'master' of ssh://tschindl@git.eclipse.org:29418/efxclipse/org.eclipse.efxclipse
Conflicts: bundles/runtime/org.eclipse.fx.ui.controls/src/org/eclipse/fx/ui/controls/styledtext/StyledTextArea.java
Diffstat (limited to 'demos/org.eclipse.fx.testcases.dnd.app.jemmy')
-rw-r--r--demos/org.eclipse.fx.testcases.dnd.app.jemmy/bin/.gitignore1
1 files changed, 0 insertions, 1 deletions
diff --git a/demos/org.eclipse.fx.testcases.dnd.app.jemmy/bin/.gitignore b/demos/org.eclipse.fx.testcases.dnd.app.jemmy/bin/.gitignore
deleted file mode 100644
index 571ee510a..000000000
--- a/demos/org.eclipse.fx.testcases.dnd.app.jemmy/bin/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/org

Back to the top