Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/7fe110aaf5d464b7934e1429b943d862a6da8c06 >--------------------------------------------------------------- commit 7fe110aaf5d464b7934e1429b943d862a6da8c06 Merge: 969f8b7... 921530b... Author: Simon Peyton Jones <[email protected]> Date: Wed May 16 11:14:21 2012 +0100 Merge branch 'master' of http://darcs.haskell.org/ghc aclocal.m4 | 2 +- bindisttest/Makefile | 4 +- bindisttest/ghc.mk | 4 +- compiler/main/DynFlags.hs | 44 ++++++-- compiler/main/HscMain.hs | 8 +- compiler/main/HscTypes.lhs | 4 + compiler/main/InteractiveEval.hs | 17 +++- compiler/main/Packages.lhs | 75 ++++++-------- compiler/parser/Lexer.x | 21 +++-- compiler/typecheck/TcRnDriver.lhs | 29 +++-- configure.ac | 4 + docs/users_guide/flags.xml | 32 +++++- docs/users_guide/packages.xml | 108 +++++++++++++++----- docs/users_guide/runghc.xml | 2 +- ghc.mk | 2 +- ghc/InteractiveUI.hs | 2 +- .../Distribution/InstalledPackageInfo/Binary.hs | 4 +- mk/config.mk.in | 2 + rules/distdir-way-opts.mk | 2 +- rules/package-config.mk | 8 +- utils/ghc-cabal/Main.hs | 2 +- utils/ghc-cabal/ghc.mk | 2 +- utils/ghc-pkg/Main.hs | 20 ++-- utils/ghc-pkg/ghc-pkg.wrapper | 2 +- utils/ghc-pkg/ghc.mk | 6 +- 25 files changed, 268 insertions(+), 138 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
