Merge branch 'master' of https://github.com/joachifm/gitignore into joachifm-master

defunkt · defunkt · commit 0c33736c4134 · 2011-02-21T18:00:32.000-08:00
diff --git a/Haskell.gitignore b/Haskell.gitignore
@@ -1,3 +1,5 @@
 dist
 *.o
 *.hi
+*.chi
+*.chs.h

-Original file line number
+Diff line change
@@ @@ -1,3 +1,5 @@ @@
 dist
 *.o
 *.hi
 +*.chi
 +*.chs.h