Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTom Schindl2016-03-16 14:21:42 +0000
committerTom Schindl2016-03-16 14:21:42 +0000
commitc012411794c3f0ae66df270d4f9b7affb895a3ad (patch)
tree56386c8134312736edfb6ac5769f0f89fc2acffc /bundles/code/org.eclipse.fx.code.editor.ldef.tests/.settings/org.eclipse.core.resources.prefs
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 'bundles/code/org.eclipse.fx.code.editor.ldef.tests/.settings/org.eclipse.core.resources.prefs')
-rw-r--r--bundles/code/org.eclipse.fx.code.editor.ldef.tests/.settings/org.eclipse.core.resources.prefs2
1 files changed, 0 insertions, 2 deletions
diff --git a/bundles/code/org.eclipse.fx.code.editor.ldef.tests/.settings/org.eclipse.core.resources.prefs b/bundles/code/org.eclipse.fx.code.editor.ldef.tests/.settings/org.eclipse.core.resources.prefs
deleted file mode 100644
index 99f26c020..000000000
--- a/bundles/code/org.eclipse.fx.code.editor.ldef.tests/.settings/org.eclipse.core.resources.prefs
+++ /dev/null
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8

Back to the top