Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/d681f8700ad2c034d5b9dacf4e681b8e7279f6ee

>---------------------------------------------------------------

commit d681f8700ad2c034d5b9dacf4e681b8e7279f6ee
Merge: a5762b7... 6247b59...
Author: Simon Marlow <[email protected]>
Date:   Tue Nov 22 11:26:28 2011 +0000

    merge

 aclocal.m4       |   16 ++++++++++++++++
 configure.ac     |    4 ++++
 includes/Stg.h   |    5 ++++-
 includes/ghc.mk  |    4 ++++
 mk/project.mk.in |    3 +++
 rts/Task.c       |   13 ++++++++++++-
 rts/Task.h       |   11 +++++++++--
 rts/sm/GC.c      |    2 +-
 rts/sm/GCTDecl.h |   15 +++++++++++++--
 9 files changed, 66 insertions(+), 7 deletions(-)




_______________________________________________
Cvs-ghc mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to