Merge pull request #1153 from SleeplessAnnoyedNerd/gitignore

Ignoring PyCharm/IntelliJ and Mac OS X stuff (2nd try)

Merge pull request #1153 from SleeplessAnnoyedNerd/gitignore
Ignoring PyCharm/IntelliJ and Mac OS X stuff (2nd try)
8ca106d2 · Michael DeHaan · 1af4677b · ddb358a3 · 8ca106d2
Commit 8ca106d2 authored Sep 30, 2012 by Michael DeHaan
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 0 deletions

.gitignore
+4 -0

No files found.
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,7 @@ rpm-build
 # Eclipse/PyDev stuff...
 .project
 .pydevproject
+# PyCharm stuff
+.idea
+# Mac OS X stuff
+.DS_Store