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

git at git.haskell.org git at git.haskell.org
Thu Jan 22 09:41:33 UTC 2015


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

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

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

commit 027acf6314e323dc25a0c1b66cb55bb9b19d9f89
Merge: bec932e 22c4d60
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Thu Jan 22 09:42:30 2015 +0000

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



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

027acf6314e323dc25a0c1b66cb55bb9b19d9f89
 compiler/cmm/CmmLex.x                    |   2 -
 compiler/cmm/CmmParse.y                  |   1 -
 compiler/parser/cutils.c                 |   6 --
 compiler/parser/cutils.h                 |   1 -
 compiler/rename/RnBinds.hs               |  12 ++--
 compiler/typecheck/TcBinds.hs            |   6 +-
 compiler/typecheck/TcPatSyn.hs           |  26 +++++----
 docs/backpack/backpack-manual.pdf        | Bin 199748 -> 202608 bytes
 docs/backpack/backpack-manual.tex        |  96 +++++++++++++++++++++++++------
 rts/sm/Scav.c                            |   2 +
 testsuite/tests/rts/LinkerUnload.hs      |  20 +++++++
 testsuite/tests/rts/Makefile             |  21 +------
 testsuite/tests/rts/linker_unload.c      |  35 ++---------
 testsuite/tests/rts/linker_unload.stdout |   4 +-
 14 files changed, 134 insertions(+), 98 deletions(-)



More information about the ghc-commits mailing list