[commit: ghc] master: Merge branch 'master' of git://git.haskell.org/ghc (dfc51a4)

Wed Oct 23 18:22:53 UTC 2013

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/dfc51a46541f28e6e0d7caec19010765f850812c/ghc

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

commit dfc51a46541f28e6e0d7caec19010765f850812c
Merge: bb9d53e d1683f0
Author: Richard Eisenberg <eir at cis.upenn.edu>
Date:   Fri Oct 18 09:22:19 2013 -0400

    Merge branch 'master' of git://git.haskell.org/ghc


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

dfc51a46541f28e6e0d7caec19010765f850812c
 aclocal.m4                        |    2 +-
 compiler/cmm/CmmLayoutStack.hs    |   36 ++++-----
 compiler/cmm/CmmOpt.hs            |   49 ------------
 compiler/codeGen/StgCmmHeap.hs    |   27 ++++++-
 compiler/iface/TcIface.lhs        |   47 +++++++++---
 compiler/main/HscMain.hs          |    9 +--
 compiler/parser/Lexer.x           |    1 +
 compiler/simplCore/Simplify.lhs   |   63 +++++++++-------
 compiler/typecheck/TcInstDcls.lhs |    3 +
 compiler/typecheck/TcTypeNats.hs  |   64 ++++++++++++----
 compiler/utils/BooleanFormula.hs  |   50 ++++++++++++-
 docs/users_guide/7.8.1-notes.xml  |   20 ++++-
 docs/users_guide/glasgow_exts.xml |  149 +++++++++++++++++++++++++++++++++++--
 libraries/Cabal                   |    2 +-
 utils/hp2ps/hp2ps.1               |    2 +
 15 files changed, 377 insertions(+), 147 deletions(-)