Merge branch 'master' of git://github.com/jmhodges/emacs-starter-kit …

…into jmhodges
sverrejoh · Jan 21, 2009 · 7a21cb8 · 7a21cb8
2 parents b95c632 + cc4dbbe
commit 7a21cb8
Showing 1 changed file with 1 addition and 0 deletions.
diff --git a/.gitignore b/.gitignore
@@ -12,3 +12,4 @@ oddmuse/*
 .nnmail-cache
 /#.newsrc-dribble#
 .svn
+.DS_Store