merge GHC HEAD
authorAdam Megacz <adam@megacz.com>
Tue, 31 May 2011 02:34:22 +0000 (19:34 -0700)
committerAdam Megacz <adam@megacz.com>
Tue, 31 May 2011 02:34:22 +0000 (19:34 -0700)
commitb2524b3960999fffdb3767900f58825903f6560f
treee3f6cd7cf54aaf81932ce65ba89231522f9144dc
parent841e81e28f8cc711f624fdca122219a5bbde2fae
parent18691d440f90a3dff4ef538091c886af505e5cf5
merge GHC HEAD
27 files changed:
compiler/basicTypes/OccName.lhs
compiler/cmm/CLabel.hs
compiler/deSugar/Desugar.lhs
compiler/deSugar/DsExpr.lhs
compiler/deSugar/DsForeign.lhs
compiler/ghc.cabal.in
compiler/hsSyn/HsExpr.lhs
compiler/hsSyn/HsTypes.lhs
compiler/iface/BinIface.hs
compiler/iface/TcIface.lhs
compiler/main/DynFlags.hs
compiler/parser/Lexer.x
compiler/parser/Parser.y.pp
compiler/parser/RdrHsSyn.lhs
compiler/prelude/PrelNames.lhs
compiler/prelude/TysPrim.lhs
compiler/prelude/TysWiredIn.lhs
compiler/rename/RnExpr.lhs
compiler/rename/RnHsSyn.lhs
compiler/rename/RnTypes.lhs
compiler/typecheck/TcEnv.lhs
compiler/typecheck/TcExpr.lhs
compiler/typecheck/TcHsSyn.lhs
compiler/typecheck/TcHsType.lhs
compiler/typecheck/TcRnMonad.lhs
compiler/typecheck/TcRnTypes.lhs
compiler/types/Kind.lhs