Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/a5bf0d5a1cf3fc1baa31cf08d2dec83d316a63c2 >--------------------------------------------------------------- commit a5bf0d5a1cf3fc1baa31cf08d2dec83d316a63c2 Merge: bba7621... dc7a936... Author: Ian Lynagh <[email protected]> Date: Tue Oct 23 13:45:47 2012 +0100 Merge branch 'master' of http://darcs.haskell.org/ghc compiler/cmm/CmmProcPoint.hs | 43 ++++++++++++++++++++++------------------- compiler/parser/Parser.y.pp | 8 ++++++- includes/Cmm.h | 3 ++ includes/stg/MiscClosures.h | 6 ++-- rts/PrimOps.cmm | 4 +- rts/Profiling.c | 4 ++- rts/Schedule.c | 4 +- 7 files changed, 43 insertions(+), 29 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
