Merge branch 'master' of http://darcs.haskell.org/ghc into ghc-generics
authorJose Pedro Magalhaes <jpm@cs.uu.nl>
Wed, 4 May 2011 19:43:41 +0000 (21:43 +0200)
committerJose Pedro Magalhaes <jpm@cs.uu.nl>
Wed, 4 May 2011 19:43:41 +0000 (21:43 +0200)
commitffabe3acb2d30be0c8e89e139f5bca7a1eb900f6
tree4d01d083d81a6ff95a911065ed179b0f4c8c91ae
parentfed25228aec3f3bd2f91c50d67043d83efb1af18
parent7028041739973c3dc17b23a98c65c892f41f0647
Merge branch 'master' of darcs.haskell.org/ghc into ghc-generics

Fixed conflicts:
compiler/prelude/PrelNames.lhs
15 files changed:
compiler/deSugar/Check.lhs
compiler/deSugar/DsArrows.lhs
compiler/deSugar/DsMeta.hs
compiler/hsSyn/HsPat.lhs
compiler/hsSyn/HsUtils.lhs
compiler/main/DynFlags.hs
compiler/parser/Lexer.x
compiler/parser/Parser.y.pp
compiler/parser/RdrHsSyn.lhs
compiler/prelude/PrelNames.lhs
compiler/rename/RnBinds.lhs
compiler/typecheck/TcGenDeriv.lhs
compiler/typecheck/TcPat.lhs
compiler/typecheck/TcRnDriver.lhs
compiler/typecheck/TcSMonad.lhs