diff options
author | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2014-03-04 23:27:21 +0100 |
---|---|---|
committer | Thomas Lenz <thomas.lenz@egiz.gv.at> | 2014-03-04 23:27:21 +0100 |
commit | e1a7da578e195a59f4981bc56a9b8c615f1e69d2 (patch) | |
tree | f77153bf75580e1672a2442020708a872053cc59 /spss/server/serverws/.settings/org.eclipse.jdt.core.prefs | |
parent | 9753d2e1c9fde6778e070825b141e0e69323c9b6 (diff) | |
parent | f5440a189b89bd4aa69d6d54445579484d5d7228 (diff) | |
download | moa-id-spss-e1a7da578e195a59f4981bc56a9b8c615f1e69d2.tar.gz moa-id-spss-e1a7da578e195a59f4981bc56a9b8c615f1e69d2.tar.bz2 moa-id-spss-e1a7da578e195a59f4981bc56a9b8c615f1e69d2.zip |
Merge branch 'moa2_0_tlenz' of https://gitlab.iaik.tugraz.at/afitzek/moa-idspss into moa2_0_tlenz
Conflicts:
id/server/doc/handbook/config/config.html
Diffstat (limited to 'spss/server/serverws/.settings/org.eclipse.jdt.core.prefs')
-rw-r--r-- | spss/server/serverws/.settings/org.eclipse.jdt.core.prefs | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/spss/server/serverws/.settings/org.eclipse.jdt.core.prefs b/spss/server/serverws/.settings/org.eclipse.jdt.core.prefs index 9ab0af09b..862602624 100644 --- a/spss/server/serverws/.settings/org.eclipse.jdt.core.prefs +++ b/spss/server/serverws/.settings/org.eclipse.jdt.core.prefs @@ -1,6 +1,5 @@ -#Mon Apr 29 14:25:29 CEST 2013
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.source=1.5
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
+org.eclipse.jdt.core.compiler.source=1.5
|