[commit: ghc] master: Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc (4a138b7)
Ian Lynagh <[email protected]>
| 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/4a138b708463a99a1087ce2d8a70239de3aa04e4 >--------------------------------------------------------------- commit 4a138b708463a99a1087ce2d8a70239de3aa04e4 Merge: 6784ddd... ed5ebee... Author: Ian Lynagh <[email protected]> Date: Fri Oct 5 01:12:45 2012 +0100 Merge branch 'master' of darcs.haskell.org:/srv/darcs//ghc compiler/deSugar/MatchLit.lhs | 2 +- compiler/hsSyn/HsExpr.lhs | 2 + compiler/typecheck/TcErrors.lhs | 91 ++++++++++++++++++++++--------------- compiler/typecheck/TcRnMonad.lhs | 9 ++-- compiler/typecheck/TcRnTypes.lhs | 5 ++- compiler/typecheck/TcSMonad.lhs | 28 ++++++------ compiler/typecheck/TcSimplify.lhs | 4 +- 7 files changed, 84 insertions(+), 57 deletions(-)