Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/115b3df1ced3d8a49d2d50631cf996afececdd29 >--------------------------------------------------------------- commit 115b3df1ced3d8a49d2d50631cf996afececdd29 Merge: 0f51b3e... d690592... Author: Ian Lynagh <[email protected]> Date: Wed Oct 26 18:22:47 2011 +0100 Merge branch 'master' of mac:ghc/git/val32/. includes/rts/EventLogFormat.h | 5 ++- rts/Capability.c | 8 ++++- rts/GetTime.h | 5 +++ rts/RtsStartup.c | 1 + rts/Trace.c | 32 ++++++++++++-------- rts/Trace.h | 26 +++++++++++----- rts/eventlog/EventLog.c | 66 ++++++++++++++++++++++++++++++++++++---- rts/eventlog/EventLog.h | 10 ++++-- rts/posix/GetTime.c | 16 ++++++++++ rts/win32/GetTime.c | 64 +++++++++++++++++++++++++--------------- 10 files changed, 173 insertions(+), 60 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
