Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/7c39ab0209fa6cc8447c9ab28563d0046dae0b7a >--------------------------------------------------------------- commit 7c39ab0209fa6cc8447c9ab28563d0046dae0b7a Merge: 1ae5e77... 59534b8... Author: Simon Peyton Jones <[email protected]> Date: Fri Aug 5 11:15:50 2011 +0100 Merge branch 'master' of http://darcs.haskell.org/ghc aclocal.m4 | 3 + boot | 4 +- compiler/cmm/CmmLex.x | 17 +++++- compiler/parser/Lexer.x | 15 +++++- docs/users_guide/extending_ghc.xml | 12 ++++- docs/users_guide/safe_haskell.xml | 2 +- ghc.mk | 96 ++++++++++++++++++----------------- ghc/ghc.mk | 2 +- mk/build.mk.sample | 9 +++ mk/config.mk.in | 7 +++ rts/Capability.c | 12 +++-- 11 files changed, 115 insertions(+), 64 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
