Merge pull request #87 from zhanming/master

add .settings/ to .gitignore and delete .settings folder.
2012-09-06 07:33:50 -07:00
parent 69e80bd349 36d169f09f
commit ddeb1100cd
6 changed files with 13 additions and 25 deletions
@@ -1,12 +1,13 @@
-.classpath
-.project
-.springBeans
-target/
-logs/
-eclipse-local.bat
-org.eclipse.jdt.core.prefs
-org.eclipse.wst.common.component
-org.eclipse.wst.common.project.facet.core.xml
-org.springframework.ide.eclipse.*.prefs
-/examples/showcase/bin/yuicompressor-2.4.7.jar
-/support/local-script/
+.classpath
+.project
+.springBeans
+target/
+logs/
+eclipse-local.bat
+org.eclipse.jdt.core.prefs
+org.eclipse.wst.common.component
+org.eclipse.wst.common.project.facet.core.xml
+org.springframework.ide.eclipse.*.prefs
+/examples/showcase/bin/yuicompressor-2.4.7.jar
+/support/local-script/
+.settings/
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
@@ -1,3 +0,0 @@
-#Sat Mar 06 12:19:37 CST 2010
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
@@ -1,3 +0,0 @@
-#Mon Jul 06 20:44:57 CST 2009
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
@@ -1,3 +0,0 @@
-#Tue Jan 19 00:05:12 CST 2010
-eclipse.preferences.version=1
-encoding/<project>=UTF-8
@@ -1,2 +0,0 @@
-eclipse.preferences.version=1
-encoding/<project>=UTF-8