Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/7e2e23b84f21388aa12f202567abbcc1cbf6de69 >--------------------------------------------------------------- commit 7e2e23b84f21388aa12f202567abbcc1cbf6de69 Merge: 525aca2... 73523d2... Author: Simon Peyton Jones <[email protected]> Date: Mon Jul 25 09:17:42 2011 +0100 Merge branch 'master' of http://darcs.haskell.org/ghc compiler/prelude/PrelNames.lhs | 1225 ++++++++++++++++++++------------------- compiler/prelude/PrelRules.lhs | 137 +++++- compiler/prelude/TysWiredIn.lhs | 19 + rts/ProfHeap.c | 4 +- rts/ProfHeap.h | 4 +- rts/Stats.c | 20 +- rts/Stats.h | 2 +- rts/sm/GC.c | 2 +- 8 files changed, 811 insertions(+), 602 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
