[commit: ghc] master: Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc (40ef925)
Simon Peyton Jones <[email protected]>
| Newsgroups | gmane.comp.lang.haskell.cvs.ghc |
|---|---|
| Message-ID | <[email protected]> |
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master http://hackage.haskell.org/trac/ghc/changeset/40ef925c54e46ef31ed1c5a97f98d9dfd6123082 >--------------------------------------------------------------- commit 40ef925c54e46ef31ed1c5a97f98d9dfd6123082 Merge: b8739b2... 866d28d... Author: Simon Peyton Jones <[email protected]> Date: Fri Dec 21 08:06:16 2012 +0000 Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc compiler/cmm/CmmPipeline.hs | 37 +++++++++--------- compiler/cmm/CmmProcPoint.hs | 2 +- compiler/main/DynFlags.hs | 48 +++++++++++------------ compiler/main/HscMain.hs | 8 ++-- compiler/main/InteractiveEval.hs | 43 +++++++++++++++----- compiler/typecheck/TcUnify.lhs | 79 +++++++++++++++++++------------------- sync-all | 10 +++-- 7 files changed, 123 insertions(+), 104 deletions(-)