merge ifnore

DeyuGoGo · DeyuGoGo · commit b168488c8129 · 2015-04-01T12:44:05.000+08:00
diff --git a/.gitignore b/.gitignore
@@ -1,3 +1,4 @@
+
 # Windows thumbnail db
 Thumbs.db
 
@@ -38,4 +39,19 @@ build
 *.iws
 *.ipr
 *~
-*.swp
+*.swp
+
+
+*.class
+
+# Mobile Tools for Java (J2ME)
+.mtj.tmp/
+
+# Package Files #
+*.jar
+*.war
+*.ear
+
+# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
+hs_err_pid*
+
