Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-kinds
http://hackage.haskell.org/trac/ghc/changeset/57403961fee220c633fe8527180fd1523f4e06db >--------------------------------------------------------------- commit 57403961fee220c633fe8527180fd1523f4e06db Merge: 2a4494b... e37893c... Author: Jose Pedro Magalhaes <[email protected]> Date: Mon Nov 14 17:04:54 2011 +0000 Merge remote branch 'origin/master' into ghc-kinds compiler/codeGen/CgPrimOp.hs | 2 +- compiler/codeGen/StgCmmPrim.hs | 2 +- compiler/deSugar/Coverage.lhs | 3 -- compiler/simplCore/FloatOut.lhs | 14 ++++++-- compiler/simplCore/Simplify.lhs | 67 +++++++++++++++++++++----------------- rts/Exception.cmm | 4 ++- rts/Profiling.c | 24 +++++++++++++- rts/Profiling.h | 2 +- rts/RaiseAsync.c | 2 +- 9 files changed, 77 insertions(+), 43 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
