Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/b662736f2f72a6a79794d852bc3fb5377771523e >--------------------------------------------------------------- commit b662736f2f72a6a79794d852bc3fb5377771523e Merge: 35b32a0... e4744cd... Author: Ian Lynagh <[email protected]> Date: Fri Mar 16 23:30:43 2012 +0000 Merge branch 'master' of win:c:/m64/head/. includes/RtsAPI.h | 2 +- includes/stg/DLL.h | 4 ++-- rts/Interpreter.c | 4 +++- rts/Linker.c | 37 ++++++++++++++++++++++--------------- rts/RtsMain.c | 4 ++-- rts/Schedule.c | 2 +- rts/StgMiscClosures.cmm | 6 +++--- rts/win32/AwaitEvent.c | 4 +--- rts/win32/seh_excn.c | 5 ++++- 9 files changed, 39 insertions(+), 29 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
