[commit: ghc] ghc-parmake-gsoc: Merge remote-tracking branch 'origin/master' into ghc-parmake-gsoc (67d1d4e)
git at git.haskell.org
git at git.haskell.org
Fri Sep 6 17:12:22 CEST 2013
Repository : ssh://git@git.haskell.org/ghc
On branch : ghc-parmake-gsoc
Link : http://ghc.haskell.org/trac/ghc/changeset/67d1d4edd5943f4425578a87e6f0940a442b3892/ghc
>---------------------------------------------------------------
commit 67d1d4edd5943f4425578a87e6f0940a442b3892
Merge: 1f5338e df61477
Author: Patrick Palka <patrick at parcs.ath.cx>
Date: Fri Sep 6 11:08:38 2013 -0400
Merge remote-tracking branch 'origin/master' into ghc-parmake-gsoc
>---------------------------------------------------------------
67d1d4edd5943f4425578a87e6f0940a442b3892
compiler/ghc.mk | 17 ++++++++++++++++-
compiler/main/DriverPipeline.hs | 15 +++++++++++++--
compiler/main/SysTools.lhs | 3 +++
compiler/parser/Parser.y.pp | 18 ------------------
compiler/stranal/WwLib.lhs | 7 +++++--
configure.ac | 6 ++++++
docs/users_guide/7.8.1-notes.xml | 11 +++++++++++
docs/users_guide/external_core.xml | 2 +-
docs/users_guide/flags.xml | 28 +++++++++++++++++-----------
docs/users_guide/using.xml | 25 ++++++++++++++++++-------
driver/ghc-usage.txt | 2 --
libraries/Cabal | 2 +-
libraries/containers | 2 +-
libraries/haskeline | 2 +-
mk/config.mk.in | 2 ++
rts/Linker.c | 8 ++++++++
validate | 13 ++++++++++++-
17 files changed, 115 insertions(+), 48 deletions(-)
More information about the ghc-commits
mailing list