X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=.darcs-boring;h=c96551c0fd4007047a3a457179b36455bba6b2ec;hb=b9d13108742ba43244490e0a90b6c80127561139;hp=db8da3ce7b8384827a42cbf8814ad4fc9ac30a82;hpb=c2f68e97717e7aa840c9871f58cfd541344806ad;p=ghc-hetmet.git

diff --git a/.darcs-boring b/.darcs-boring
index db8da3c..c96551c 100644
--- a/.darcs-boring
+++ b/.darcs-boring
@@ -33,7 +33,6 @@
 ^libraries/HUnit(/|$)
 ^libraries/HaXml(/|$)
 ^libraries/Japi(/|$)
-^libraries/ObjectIO(/|$)
 ^libraries/OpenAL(/|$)
 ^libraries/OpenGL(/|$)
 ^libraries/QuickCheck(/|$)
@@ -81,7 +80,7 @@
 # Other library bits that get generated:
 ^libraries/bootstrapping/
 ^libraries/stamp/
-^libraries/cabal$
+^libraries/cabal-bin$
 ^libraries/ifBuildable(/|$)
 ^libraries/installPackage(/|$)
 ^libraries/index.html
@@ -133,6 +132,8 @@
 (^|/)BitKeeper($|/)
 (^|/)ChangeSet($|/)
 (^|/)\.svn($|/)
+(^|/)\.git($|/)
+\.git-ignore$
 \.py[co]$
 \#
 \.cvsignore$
@@ -166,6 +167,8 @@
 ^mk/stamp-h$
 (^|/)autom4te.cache($|/)
 ^rts/AutoApply.*cmm$
+^rts/sm/Evac_thr.c$
+^rts/sm/Scav_thr.c$
 package.conf.inplace$
 package.conf.installed$
 (^|/)config.log$
@@ -224,7 +227,6 @@ package.conf.installed$
 ^driver/package.conf.inplace.old$
 ^driver/split/ghc-split$
 ^driver/split/ghc-split.prl$
-^driver/stamp-pkg-conf-ghc$
 ^driver/stamp-pkg-conf-rts$
 ^includes/DerivedConstants.h$
 ^includes/GHCConstants.h$