Merge remote-tracking branch 'origin/master' into tc-untouchables
authorSimon Peyton Jones <simonpj@microsoft.com>
Tue, 18 Sep 2012 16:40:23 +0000 (17:40 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Tue, 18 Sep 2012 16:40:23 +0000 (17:40 +0100)
commit8e7d41525dd6360eb828b14b2c1c764ed5023916
tree9c9482d8c27173064199232fa01a4f27af84114d
parent94291904305fb4885cbbd3b8011d1b8fa4e308b2
parent16cc37ff034213250c764cd941908398e4150100
Merge remote-tracking branch 'origin/master' into tc-untouchables
compiler/main/DynFlags.hs
compiler/typecheck/Inst.lhs
compiler/typecheck/TcHsSyn.lhs
compiler/typecheck/TcTyClsDecls.lhs