Merge master into the ghc-new-co branch
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 6 May 2011 14:56:06 +0000 (15:56 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 6 May 2011 14:56:06 +0000 (15:56 +0100)
commitca53c38335cdc671f0b1e0949aa1514fc3fd72a5
treefb8adff51bd236c6c912a062702a8e08937333d4
parent4f8d714962667c219de4e684fe069136a0f78729
parent246183c669a1e851ccc42697dbbf309292bf2a08
Merge master into the ghc-new-co branch
21 files changed:
compiler/deSugar/Check.lhs
compiler/deSugar/DsExpr.lhs
compiler/deSugar/Match.lhs
compiler/ghc.cabal.in
compiler/hsSyn/HsPat.lhs
compiler/hsSyn/HsUtils.lhs
compiler/iface/IfaceSyn.lhs
compiler/main/DynFlags.hs
compiler/prelude/PrelNames.lhs
compiler/rename/RnBinds.lhs
compiler/typecheck/TcArrows.lhs
compiler/typecheck/TcExpr.lhs
compiler/typecheck/TcGenDeriv.lhs
compiler/typecheck/TcHsSyn.lhs
compiler/typecheck/TcMatches.lhs
compiler/typecheck/TcPat.lhs
compiler/typecheck/TcRnDriver.lhs
compiler/typecheck/TcRnMonad.lhs
compiler/typecheck/TcRnTypes.lhs
compiler/typecheck/TcSMonad.lhs
compiler/typecheck/TcUnify.lhs