Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/d19c829904aec3be6bc807640573fdf5dcf05928 >--------------------------------------------------------------- commit d19c829904aec3be6bc807640573fdf5dcf05928 Merge: 00f0ddf... 927df64... Author: Simon Marlow <[email protected]> Date: Mon Jun 6 11:39:00 2011 +0100 Merge remote branch 'working/master' compiler/hsSyn/HsImpExp.lhs | 12 +++- compiler/main/GHC.hs | 4 + compiler/main/HscTypes.lhs | 48 ++++++++------ compiler/main/InteractiveEval.hs | 44 ++++--------- compiler/typecheck/TcRnDriver.lhs | 16 +---- ghc.mk | 8 +- ghc/GhciMonad.hs | 6 +- ghc/InteractiveUI.hs | 129 +++++++++++++++++++++++-------------- utils/compare_sizes/ghc.mk | 4 +- utils/ghc-pwd/ghc.mk | 4 +- utils/ghctags/ghc.mk | 10 ++-- utils/hpc/ghc.mk | 10 ++-- utils/runghc/ghc.mk | 14 ++-- 13 files changed, 169 insertions(+), 140 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
