Merge commit 'origin/master' into HEAD

[urisagit/Stem.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 403a422..6af5e59 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,6 @@ MANIFEST.bak
 _build/
 Build
 Makefile
-lib/
 blib/
 
 # Temp, old and emacs backup files.
@@ -20,3 +19,22 @@ blib/
 .#*
 .*.swp
 
+# 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
+dlug
+flow
+intel
+pod
+scaffidi
+slides
+stem2pod
+test
+