Merge remote branch 'origin/master' into bug261-resized-filenames

[mediagoblin.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 4c62a7667d07633f70412a23887dbb93f92ad5b0..a15a56975925e67de05336d3571933d235f4d22f 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -9,6 +9,7 @@
 /lib/
 /include/
 /parts/
+/share/
 /mediagoblin.egg-info
 /docs/_build/
 /docs/build
@@ -19,12 +20,16 @@
 /celery.db
 /kombu.db
 /server-log.txt
+/mediagoblin/db/sql_switch.py
 
 # Tests
 /mediagoblin/tests/user_dev/
 
-.installed.cfg
+# File extensions
 *.pyc
 *.pyo
 *~
 *.swp
+
+# The legacy of buildout
+.installed.cfg
\ No newline at end of file