Merge branch 'master' of feistymeow.org:feisty_meow

[feisty_meow.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 25fc0c0163e1ade4a77ff1645f50aacf65f8283a..022cb9f5218e8174c4fb339b344142d269567e42 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1,10 +1,10 @@
-
-# ignore generated files of various types.
+# ignore generated or non-useful files of various types.
 
 *~
 *#
-__build_configuration.h
+*.bak
 *.class
+.DS_Store
 *.log
 *.gz
 *.o
@@ -13,3 +13,5 @@ __build_configuration.h
 *_version.h
 Thumbs.db
 TEMPS*
+*.swp
+*.tmp