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

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/fc0902e7ed7b87c26d2686ba396eaaf1978926f1

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

commit fc0902e7ed7b87c26d2686ba396eaaf1978926f1
Merge: e533532... 592def0...
Author: Simon Peyton Jones <[email protected]>
Date:   Thu Jun 16 19:14:35 2011 +0100

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

 compiler/basicTypes/Module.lhs   |    4 +-
 compiler/ghc.cabal.in            |    2 +
 compiler/ghci/Linker.lhs         |   41 +++++-
 compiler/main/DynFlags.hs        |   23 +++
 compiler/main/DynamicLoading.hs  |  150 +++++++++++++++++++
 compiler/main/GhcPlugins.hs      |   83 +++++++++++
 compiler/prelude/PrelNames.lhs   |   18 +++
 compiler/simplCore/CoreMonad.lhs |  261 +++++++++-------------------------
 compiler/simplCore/SimplCore.lhs |  294 ++++++++++++++++++++++++++++++++++++--
 9 files changed, 665 insertions(+), 211 deletions(-)



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

Reply via email to