Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/ae3b612854ea5d5877943d94f36a65699615a7d5 >--------------------------------------------------------------- commit ae3b612854ea5d5877943d94f36a65699615a7d5 Merge: c492109... 4c1ea5c... Author: Simon Peyton Jones <[email protected]> Date: Thu Aug 4 14:03:18 2011 +0100 Merge branch 'master' of http://darcs.haskell.org/ghc compiler/basicTypes/Id.lhs | 14 +-- compiler/codeGen/CgTicky.hs | 1 + compiler/codeGen/StgCmmTicky.hs | 1 + compiler/coreSyn/CoreUtils.lhs | 4 +- compiler/deSugar/DsBinds.lhs | 6 +- compiler/main/DriverPipeline.hs | 4 +- compiler/specialise/Specialise.lhs | 1 + compiler/typecheck/TcCanonical.lhs | 1 - compiler/typecheck/TcErrors.lhs | 2 +- compiler/typecheck/TcMType.lhs | 4 +- compiler/typecheck/TcRnTypes.lhs | 1 - compiler/typecheck/TcSimplify.lhs | 1 - compiler/typecheck/TcType.lhs | 148 ++++++++++++++++++++-- compiler/types/Coercion.lhs | 12 +- compiler/types/OptCoercion.lhs | 1 + compiler/types/Type.lhs | 194 ++++++---------------------- compiler/vectorise/Vectorise/Type/Type.hs | 10 +-- 17 files changed, 204 insertions(+), 201 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
