Merge remote-tracking branch 'origin/master' into tc-untouchables
authorSimon Peyton Jones <simonpj@microsoft.com>
Fri, 28 Sep 2012 14:53:45 +0000 (15:53 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Fri, 28 Sep 2012 14:53:45 +0000 (15:53 +0100)
commit6e3e64aeda1add215ffccca87931a60e4f8b53e5
treea8cc5dd835ed86fb02f746969cf0cb376942f6b2
parent9a058b173a6e12296ac302a6ccd22d9c8f0a09d0
parent42cb30bd2c00705da598cc8d4170b41fb5693166
Merge remote-tracking branch 'origin/master' into tc-untouchables
compiler/main/DynFlags.hs
compiler/typecheck/TcRnMonad.lhs