Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/d45197aabb22178066a8ec50d29331786a0c518c >--------------------------------------------------------------- commit d45197aabb22178066a8ec50d29331786a0c518c Merge: c5f7496... daead6b... Author: Ian Lynagh <[email protected]> Date: Sun May 8 16:13:33 2011 +0100 Merge branch 'coloured-core' of https://github.com/nominolo/ghc into coloured-core compiler/basicTypes/Module.lhs | 6 +- compiler/main/CmdLineParser.hs | 2 +- compiler/main/DynFlags.hs | 8 +- compiler/main/ErrUtils.lhs | 3 +- compiler/nativeGen/AsmCodeGen.lhs | 2 +- compiler/typecheck/TcRnMonad.lhs | 4 +- compiler/utils/Outputable.lhs | 281 ++++++++++++++++++++++++------------- compiler/utils/Pretty.lhs | 7 +- ghc/InteractiveUI.hs | 2 +- 9 files changed, 203 insertions(+), 112 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
