Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 7 Jun 2012 11:10:38 +0000 (12:10 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 7 Jun 2012 11:10:38 +0000 (12:10 +0100)
1  2 
compiler/basicTypes/DataCon.lhs
compiler/typecheck/TcBinds.lhs
compiler/typecheck/TcClassDcl.lhs
compiler/typecheck/TcHsType.lhs
compiler/typecheck/TcMType.lhs
compiler/typecheck/TcRnTypes.lhs
compiler/typecheck/TcSplice.lhs

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