Repository : ssh://darcs.haskell.org//srv/darcs/ghc

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/17e9e851bac1cddb52ba822433e47d90e33bec77

>---------------------------------------------------------------

commit 17e9e851bac1cddb52ba822433e47d90e33bec77
Merge: f96db3c... fd74243...
Author: Simon Peyton Jones <[email protected]>
Date:   Thu Nov 10 20:00:52 2011 +0000

    Merge branch 'master' of http://darcs.haskell.org/ghc

 compiler/deSugar/DsExpr.lhs                        |    6 +-
 compiler/deSugar/DsListComp.lhs                    |   16 +-
 compiler/deSugar/DsMonad.lhs                       |  209 ++-
 compiler/deSugar/DsUtils.lhs                       |    4 +-
 compiler/ghc.cabal.in                              |    1 +
 compiler/iface/BinIface.hs                         | 1650 ++++++++++----------
 compiler/iface/FlagChecker.hs                      |   43 +
 compiler/iface/LoadIface.lhs                       |    1 +
 compiler/iface/MkIface.lhs                         |  779 +++++-----
 compiler/main/DynFlags.hs                          |   38 +-
 compiler/main/HscTypes.lhs                         |  443 +++---
 compiler/main/Packages.lhs                         |    8 +-
 compiler/prelude/PrelNames.lhs                     |   64 +-
 compiler/simplCore/SimplEnv.lhs                    |   11 +-
 compiler/simplCore/Simplify.lhs                    |    6 +-
 compiler/typecheck/TcExpr.lhs                      |   10 +-
 compiler/utils/Binary.hs                           |   32 +-
 .../vectorise/Vectorise/Builtins/Initialise.hs     |   14 +-
 mk/validate-settings.mk                            |    2 +-
 19 files changed, 1694 insertions(+), 1643 deletions(-)




_______________________________________________
Cvs-ghc mailing list
[email protected]
http://www.haskell.org/mailman/listinfo/cvs-ghc

Reply via email to