Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc
authorSimon Peyton Jones <simonpj@microsoft.com>
Wed, 2 Jan 2013 16:40:13 +0000 (16:40 +0000)
committerSimon Peyton Jones <simonpj@microsoft.com>
Wed, 2 Jan 2013 16:40:13 +0000 (16:40 +0000)
commit1687a666052ba19249186d0c4bb8e2dc3d7847f2
treee8a5e7adb676cc02b84b9c6e4a803af9cf990411
parent6761dc2509de8b7f6b9f6f847d1e22f7a1849a79
parent7fa2ce2043e2faed2b2b545ba5c1c9958954800a
Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc
compiler/basicTypes/MkId.lhs
compiler/coreSyn/CoreLint.lhs
compiler/coreSyn/CoreSubst.lhs
compiler/deSugar/DsBinds.lhs
compiler/main/DynFlags.hs
compiler/simplCore/Simplify.lhs
compiler/typecheck/TcDeriv.lhs