X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=.gitignore;h=ac8c70e59dc154c800739b118cb52de920b27a66;hp=692b31fde99b9f8855a8cbe04ed2940ae6b815ee;hb=HEAD;hpb=2691104be21d42ed5c0e6b3eb83da3f8eab231c9

diff --git a/.gitignore b/.gitignore
index 692b31f..ac8c70e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,6 +7,7 @@
 *.BAK
 *.orig
 *.prof
+*.rej
 
 *.hi
 *.hi-boot
@@ -136,7 +137,7 @@ _darcs/
 /driver/split/dist/ghc-split
 /driver/split/dist/ghc-split.prl
 /driver/stamp-pkg-conf-rts
-/extra-gcc-opts
+/settings
 /ghc.spec
 /ghc/ghc-bin.cabal
 /ghc/stage1/
@@ -231,3 +232,5 @@ _darcs/
 /utils/runstdtest/runstdtest
 /utils/unlit/unlit
 
+
+/extra-gcc-opts
\ No newline at end of file