Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 19 Oct 2012 19:35:19 +0000 (20:35 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 19 Oct 2012 19:35:19 +0000 (20:35 +0100)
commit429c81c5ae861afd0e6910b7c0d331e65e8d4022
treecff5e73aa7cdff9d42bf8ae4234031066b5a70bb
parent8e189a7d9924166e9bb4c4e0200fa64512a7d151
parent6c547271343be0620503f07508b109b170562af6
Merge branch 'master' of darcs.haskell.org/ghc
compiler/basicTypes/OccName.lhs
compiler/iface/TcIface.lhs
compiler/main/DynFlags.hs
compiler/prelude/PrelRules.lhs
compiler/rename/RnBinds.lhs
compiler/simplCore/Simplify.lhs
compiler/typecheck/TcErrors.lhs
compiler/typecheck/TcRnDriver.lhs
compiler/typecheck/TcSplice.lhs
compiler/typecheck/TcTyClsDecls.lhs
compiler/typecheck/TcUnify.lhs