[commit: ghc] master: Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc (d163845)
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/d163845c7cade0892db4325e430a84a350ff147c >--------------------------------------------------------------- commit d163845c7cade0892db4325e430a84a350ff147c Merge: 2293238... 225172e... Author: Ian Lynagh <[email protected]> Date: Thu Nov 1 14:32:20 2012 +0000 Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc compiler/main/DynFlags.hs | 6 ++++++ compiler/main/InteractiveEval.hs | 10 ++++++---- docs/users_guide/flags.xml | 6 ++++++ docs/users_guide/ghci.xml | 13 +++++++------ includes/Rts.h | 6 ++++++ includes/rts/storage/Closures.h | 2 -- mk/config.mk.in | 8 +++++--- rts/HeapStackCheck.cmm | 6 +++++- rts/PrimOps.cmm | 4 ++-- rts/StgMiscClosures.cmm | 2 +- rts/ghc.mk | 2 +- rts/sm/GC.c | 8 +++++--- 12 files changed, 50 insertions(+), 23 deletions(-)