Merge commit 'origin/master' into HEAD

[urisagit/Stem.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index ec302ab..6af5e59 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -15,16 +15,20 @@ blib/
 # Temp, old and emacs backup files.
 *~
 *.old
-old*
 \#*#
 .#*
 .*.swp
-lib-pod
+
+# archive files
+*.gz
+*.bz2
+
+# stuff from uri's working dir that he doesn't want in the repo
+old*
 *.ok
+lib-pod
 modules
-
 event_test
-*.gz
 dlug
 flow
 intel
@@ -34,4 +38,3 @@ slides
 stem2pod
 test
 
-