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)
commit7dffc188e7351c142d05235dc87d77f16454066e
treec0138668d79b43fe247cb744b5f44e646063fc31
parent97db0edc4e637dd61ec635d1f9b6b6dd25ad890c
parent03d360f289a1c7e93fedf8cfa274cbe5929cd32c
Merge remote branch 'origin/master'
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