[commit: ghc] master: Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc (bb8cb0e)
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/bb8cb0e72b4a720f32c842d0f7e6b2dad2328578 >--------------------------------------------------------------- commit bb8cb0e72b4a720f32c842d0f7e6b2dad2328578 Merge: ad94e00... a609027... Author: Ian Lynagh <[email protected]> Date: Mon Oct 15 21:52:41 2012 +0100 Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc compiler/prelude/primops.txt.pp | 11 +++++++++++ includes/rts/EventLogFormat.h | 6 +++--- includes/stg/MiscClosures.h | 1 + rts/Linker.c | 1 + rts/PrimOps.cmm | 25 +++++++++++++++++++++++++ rts/RtsProbes.d | 1 + rts/Trace.c | 22 ++++++++++++++++++++++ rts/Trace.h | 10 ++++++++++ rts/eventlog/EventLog.c | 23 +++++++++++++++++++++++ rts/eventlog/EventLog.h | 2 ++ 10 files changed, 99 insertions(+), 3 deletions(-)