Merge remote branch 'matplotlib/master'

NelleV · Mar 4, 2013 · f268e4b · f268e4b
2 parents 4e5265b + 5da2d6c
commit f268e4b
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -35,6 +35,7 @@ dist
 
 # OS generated files #
 ######################
+.directory
 .gdb_history
 .DS_Store?
 ehthumbs.db