Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : type-nats
http://hackage.haskell.org/trac/ghc/changeset/d3b43108979a84261a7460ca9c071f214fadf985 >--------------------------------------------------------------- commit d3b43108979a84261a7460ca9c071f214fadf985 Merge: deed56f... a7e1136... Author: Iavor S. Diatchki <[email protected]> Date: Tue Mar 20 17:22:42 2012 -0700 Merge remote-tracking branch 'origin/master' into type-nats compiler/deSugar/DsMeta.hs | 110 ++++++++++++++++--------------------- compiler/deSugar/DsMonad.lhs | 5 ++- compiler/nativeGen/X86/Regs.hs | 4 ++ compiler/simplCore/SetLevels.lhs | 3 +- includes/Rts.h | 18 ++++++ includes/mkDerivedConstants.c | 20 ++++---- rts/HeapStackCheck.cmm | 12 +---- rts/Schedule.c | 2 +- rts/StgCRun.c | 32 +++++++---- rts/ghc.mk | 1 - rts/win32/ThrIOManager.c | 2 +- 11 files changed, 110 insertions(+), 99 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
