Follow GHC.Bool/GHC.Types merge
authorIan Lynagh <igloo@earth.li>
Sat, 23 Oct 2010 16:54:22 +0000 (16:54 +0000)
committerIan Lynagh <igloo@earth.li>
Sat, 23 Oct 2010 16:54:22 +0000 (16:54 +0000)
commit28cb2d6d40264796fb84da1f352490fd2b8eb27f
treedad732659400989ce4f498b5b1d4098f5a22aafd
parentc91279a1e4fd631d42ad903eaf699a96c22f380e
Follow GHC.Bool/GHC.Types merge
12 files changed:
compiler/codeGen/StgCmmExpr.hs
compiler/coreSyn/CoreUnfold.lhs
compiler/coreSyn/CoreUtils.lhs
compiler/prelude/PrelNames.lhs
compiler/prelude/TysWiredIn.lhs
compiler/simplCore/SAT.lhs
rts/Exception.cmm
rts/Prelude.h
rts/PrimOps.cmm
rts/package.conf.in
rts/win32/libHSghc-prim.def
utils/genprimopcode/Main.hs