Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/5e0059a9fd797d550aa7dd856a14c12eb0914578 >--------------------------------------------------------------- commit 5e0059a9fd797d550aa7dd856a14c12eb0914578 Merge: 36df2f3... 96d64fe... Author: Simon Marlow <[email protected]> Date: Mon May 23 10:24:53 2011 +0100 Merge branch 'master' of /home/simonmar/ghc-git/. * 'master' of /home/simonmar/ghc-git/.: Revert "Add capability sets to the event system. Contains code from Duncan Coutts." includes/rts/EventLogFormat.h | 39 +----------- rts/Capability.c | 4 - rts/RtsProbes.d | 6 -- rts/RtsStartup.c | 4 - rts/Schedule.c | 16 ++-- rts/Trace.c | 67 ------------------ rts/Trace.h | 69 ------------------- rts/eventlog/EventLog.c | 149 +---------------------------------------- rts/eventlog/EventLog.h | 29 -------- rts/ghc.mk | 1 - 10 files changed, 10 insertions(+), 374 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
