[commit: ghc] master: Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc (fbff64a)

Simon Peyton Jones <[email protected]> Fri, 04 Jan 2013 02:31:48 -0800

Newsgroups	gmane.comp.lang.haskell.cvs.ghc
Message-ID	<[email protected]>

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

On branch  : master

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

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

commit fbff64a414182800ea474a83f414a312dcc52fa5
Merge: 74d4018... d967432...
Author: Simon Peyton Jones <[email protected]>
Date:   Fri Jan 4 10:31:25 2013 +0000

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

 compiler/ghc.cabal.in                   |    3 +-
 compiler/llvmGen/LlvmCodeGen/CodeGen.hs |    8 +++++-
 compiler/utils/MonadUtils.hs            |   32 +-----------------------------
 ghc.mk                                  |   22 ++++++++++----------
 ghc/GhciMonad.hs                        |   22 +++++---------------
 mk/config.mk.in                         |    2 +
 mk/validate-settings.mk                 |    3 ++
 validate                                |    9 ++-----
 8 files changed, 35 insertions(+), 66 deletions(-)