Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/a1d588650d715a8c0edd4828e9c2e1dd1d760f48 >--------------------------------------------------------------- commit a1d588650d715a8c0edd4828e9c2e1dd1d760f48 Merge: c492e50... f542da4... Author: Simon Peyton Jones <[email protected]> Date: Mon Dec 19 16:45:53 2011 +0000 Merge branch 'master' of http://darcs.haskell.org//ghc compiler/codeGen/CgProf.hs | 2 +- compiler/codeGen/StgCmmProf.hs | 16 ++++++------ compiler/typecheck/TcCanonical.lhs | 2 +- compiler/typecheck/TcSplice.lhs | 48 +++++++++++++++++++---------------- compiler/utils/Exception.hs | 8 ------ compiler/vectorise/Vectorise.hs | 16 ++++++++--- compiler/vectorise/Vectorise/Exp.hs | 26 ++++++++++++++++-- includes/rts/prof/CCS.h | 2 +- rts/StgCRun.c | 12 ++++++++ 9 files changed, 84 insertions(+), 48 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
