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)
1  2 
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

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge