Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/4fb390370051439c89958be96308d6d0577ff864 >--------------------------------------------------------------- commit 4fb390370051439c89958be96308d6d0577ff864 Merge: 9fd5a2c... 1469f1e... Author: Ian Lynagh <[email protected]> Date: Fri Dec 2 22:30:58 2011 +0000 Merge branch 'master' of http://darcs.haskell.org/ghc compiler/basicTypes/Unique.lhs | 10 ++- compiler/codeGen/CgProf.hs | 6 ++- compiler/codeGen/StgCmmProf.hs | 12 +++- compiler/coreSyn/CoreSyn.lhs | 10 +--- compiler/deSugar/Coverage.lhs | 103 ++++++++++++++++++++++------------ compiler/deSugar/DsExpr.lhs | 5 +- compiler/iface/BinIface.hs | 23 +++++--- compiler/main/DynFlags.hs | 2 + compiler/profiling/CostCentre.lhs | 91 ++++++++++++++++-------------- compiler/profiling/SCCfinal.lhs | 8 ++- docs/users_guide/ghci.xml | 3 +- docs/users_guide/profiling.xml | 18 ++++++ docs/users_guide/runtime_control.xml | 8 ++- includes/rts/prof/CCS.h | 4 +- rts/Profiling.c | 14 ++-- 15 files changed, 199 insertions(+), 118 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
