[commit: ghc] type-holes-branch: Merge https://github.com/ghc/ghc (c7442b5)
Simon Peyton Jones <[email protected]>
| Newsgroups | gmane.comp.lang.haskell.cvs.ghc |
|---|---|
| Message-ID | <[email protected]> |
Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : type-holes-branch http://hackage.haskell.org/trac/ghc/changeset/c7442b5ca99ffb7be9d577534cf7605413ec4649 >--------------------------------------------------------------- commit c7442b5ca99ffb7be9d577534cf7605413ec4649 Merge: ec4feca... 55cdcc9... Author: Thijs Alkemade <[email protected]> Date: Wed Aug 15 12:29:49 2012 +0200 Merge https://github.com/ghc/ghc compiler/main/CmdLineParser.hs | 12 +++++--- compiler/main/DriverPipeline.hs | 7 ++++- compiler/typecheck/TcInstDcls.lhs | 2 +- docs/users_guide/glasgow_exts.xml | 52 ++++++++++--------------------------- ghc/InteractiveUI.hs | 4 ++- ghc/Main.hs | 9 +++++- mk/config.mk.in | 2 +- rts/Linker.c | 39 +++++++++++++++++++++++++--- rts/Proftimer.c | 8 +++--- rts/Proftimer.h | 2 - rules/haddock.mk | 3 +- 11 files changed, 80 insertions(+), 60 deletions(-)