Merge remote branch 'origin/master'
authorSimon Peyton Jones <simonpj@microsoft.com>
Tue, 8 Jan 2013 08:27:11 +0000 (08:27 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Tue, 8 Jan 2013 08:27:11 +0000 (08:27 +0000)
1  2 
compiler/ghc.cabal.in
compiler/main/DynFlags.hs
compiler/typecheck/TcBinds.lhs
compiler/typecheck/TcDeriv.lhs
compiler/typecheck/TcInstDcls.lhs
compiler/typecheck/TcMType.lhs
compiler/typecheck/TcPat.lhs

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