[commit: ghc] master: Merge branch 'master' of http://darcs.haskell.org/ghc (935bf7c)
Ian Lynagh <[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/935bf7c05516ea941b3b6158440e9fd626d0d892 >--------------------------------------------------------------- commit 935bf7c05516ea941b3b6158440e9fd626d0d892 Merge: a299f10... 0b3811c... Author: Ian Lynagh <[email protected]> Date: Wed Oct 24 14:03:18 2012 +0100 Merge branch 'master' of http://darcs.haskell.org/ghc compiler/cmm/CmmPipeline.hs | 32 +++++++++++++++++++++++++++++++- compiler/cmm/CmmUtils.hs | 2 ++ compiler/ghci/Linker.lhs | 4 ++-- rts/PrimOps.cmm | 2 +- rules/shell-wrapper.mk | 6 +++--- 5 files changed, 39 insertions(+), 7 deletions(-)