Merge remote-tracking branch 'Coding/master'

2015-08-18 17:06:43 +08:00 · 2015-08-18 17:06:43 +08:00 · 1ed77faf0a
parent f0e5538eb6 7a45268dfd
commit 1ed77faf0a
8 changed files with 159 additions and 168 deletions
--- a/.gitignore
+++ b/.gitignore
@ -1,3 +1,6 @@
+/.settings
+.classpath
+
 # netbeans
 /nbproject

--- a/.settings/org.eclipse.core.resources.prefs
+++ b/.settings/org.eclipse.core.resources.prefs
@ -1,3 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
-encoding/src=UTF-8
--- a/.settings/org.eclipse.jdt.core.prefs
+++ b/.settings/org.eclipse.jdt.core.prefs
@ -1,5 +0,0 @@
-eclipse.preferences.version=1
-org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.7
-org.eclipse.jdt.core.compiler.compliance=1.7
-org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning
-org.eclipse.jdt.core.compiler.source=1.7
--- a/.settings/org.eclipse.m2e.core.prefs
+++ b/.settings/org.eclipse.m2e.core.prefs
@ -1,4 +0,0 @@
-activeProfiles=
-eclipse.preferences.version=1
-resolveWorkspaceProjects=true
-version=1