Merge branch 'master' of http://darcs.haskell.org/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Thu, 21 Jul 2011 16:22:47 +0000 (17:22 +0100)
committerSimon Peyton Jones <simonpj@microsoft.com>
Thu, 21 Jul 2011 16:22:47 +0000 (17:22 +0100)
commit9500b166d07e5a6ef7717f30ab89bb3e36eb77ea
treef7d0bc6fe5203251ed85057860948a609532c557
parent5c9dfadd979ca3ccb8dd7c21ddb9fb0fe9cdb3fe
parentc555564086869132fcc21354be80dcfe3e54642a
Merge branch 'master' of darcs.haskell.org/ghc
compiler/hsSyn/Convert.lhs
compiler/simplCore/CoreMonad.lhs
compiler/typecheck/TcSplice.lhs