Merge remote branch 'origin/master' into ghc-new-co
authorSimon Peyton Jones <simonpj@microsoft.com>
Sat, 30 Apr 2011 13:26:48 +0000 (14:26 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Sat, 30 Apr 2011 13:26:48 +0000 (14:26 +0100)
commit224ef3094189bc9a33f23285b5dccbffdd8d7de0
tree551c816c8c8f7df25f060f27de82c16b00f7d2c5
parentfdf8656855d26105ff36bdd24d41827b05037b91
parentd1bffa693adfa48ef65240bb3c097f5f5f77868e
Merge remote branch 'origin/master' into ghc-new-co

Conflicts:
compiler/typecheck/TcErrors.lhs
compiler/typecheck/TcSMonad.lhs
compiler/typecheck/TcType.lhs
compiler/types/TypeRep.lhs
23 files changed:
compiler/basicTypes/Var.lhs
compiler/cmm/CmmCPS.hs
compiler/ghci/RtClosureInspect.hs
compiler/hsSyn/HsBinds.lhs
compiler/iface/MkIface.lhs
compiler/main/DynFlags.hs
compiler/main/GHC.hs
compiler/main/HscTypes.lhs
compiler/prelude/PrelRules.lhs
compiler/rename/RnBinds.lhs
compiler/simplCore/Simplify.lhs
compiler/typecheck/TcBinds.lhs
compiler/typecheck/TcDeriv.lhs
compiler/typecheck/TcErrors.lhs
compiler/typecheck/TcGenDeriv.lhs
compiler/typecheck/TcInteract.lhs
compiler/typecheck/TcMType.lhs
compiler/typecheck/TcRnTypes.lhs
compiler/typecheck/TcSMonad.lhs
compiler/typecheck/TcSimplify.lhs
compiler/typecheck/TcType.lhs
compiler/typecheck/TcUnify.lhs
compiler/types/TypeRep.lhs