[commit: ghc] type-holes-branch: Merge branch 'master' of https://github.com/xnyhps/ghc (7816d51)
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/7816d511bee880176bfb27fdfe7929cf7dd2a8cc >--------------------------------------------------------------- commit 7816d511bee880176bfb27fdfe7929cf7dd2a8cc Merge: d4af6fe... 2870614... Author: Thijs Alkemade <[email protected]> Date: Fri Apr 20 19:10:22 2012 +0200 Merge branch 'master' of https://github.com/xnyhps/ghc Conflicts: compiler/deSugar/DsExpr.lhs compiler/hsSyn/HsExpr.lhs compiler/iface/IfaceEnv.lhs compiler/main/HscTypes.lhs compiler/parser/Lexer.x compiler/parser/Parser.y.pp compiler/prelude/TysWiredIn.lhs compiler/rename/RnExpr.lhs compiler/rename/RnTypes.lhs compiler/typecheck/Inst.lhs compiler/typecheck/TcCanonical.lhs compiler/typecheck/TcErrors.lhs compiler/typecheck/TcExpr.lhs compiler/typecheck/TcInteract.lhs compiler/typecheck/TcMType.lhs compiler/typecheck/TcRnDriver.lhs compiler/typecheck/TcRnTypes.lhs compiler/typecheck/TcSMonad.lhs compiler/types/TyCon.lhs compiler/types/Type.lhs compiler/coreSyn/CoreFVs.lhs | 2 ++ compiler/coreSyn/CorePrep.lhs | 1 + compiler/coreSyn/CoreSubst.lhs | 2 ++ compiler/coreSyn/CoreSyn.lhs | 5 +++++ compiler/coreSyn/CoreTidy.lhs | 1 + compiler/coreSyn/CoreUnfold.lhs | 1 + compiler/coreSyn/CoreUtils.lhs | 1 + compiler/coreSyn/PprCore.lhs | 2 ++ compiler/ghci/ByteCodeGen.lhs | 4 ++++ compiler/simplCore/OccurAnal.lhs | 2 ++ compiler/simplCore/Simplify.lhs | 1 + 11 files changed, 22 insertions(+), 0 deletions(-)