Merge remote-tracking branch 'gstrat/elep' into elep

[django-cas-provider.git] / .gitignore

diff --git a/.gitignore b/.gitignore
index 0d20b64..2bed7fd 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1,14 @@
+# Python garbage

 *.pyc
 *.pyc

+*.egg-info
+/build
+/dist
+
+# Mac OS X garbage
+.DS_Store
+
+# PyDev garbage
+.tmp*
+/.project
+/.pydevproject
+/.settings