Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-kinds
http://hackage.haskell.org/trac/ghc/changeset/63fae679ee96fcd9d0fa9636cd8d955f43e90377 >--------------------------------------------------------------- commit 63fae679ee96fcd9d0fa9636cd8d955f43e90377 Merge: e0f0611... eecd53b... Author: Julien Cretin <g...@ia0.eu> Date: Wed Sep 14 16:29:39 2011 +0200 Merge branch 'master' into ghc-kinds compiler/basicTypes/Literal.lhs | 27 ++++++++-- compiler/basicTypes/MkId.lhs | 43 ++++++++++++++++- compiler/codeGen/CgUtils.hs | 3 + compiler/coreSyn/CoreLint.lhs | 15 ++++-- compiler/coreSyn/CorePrep.lhs | 57 +++++++++++++++++++-- compiler/coreSyn/CoreUtils.lhs | 1 + compiler/coreSyn/MkCore.lhs | 34 +------------ compiler/ghc.mk | 10 ++++ compiler/ghci/ByteCodeGen.lhs | 4 ++ compiler/prelude/PrelNames.lhs | 29 +++++++++-- compiler/prelude/PrelRules.lhs | 54 +++++---------------- compiler/prelude/TysWiredIn.lhs | 93 +++++++++++++++++++++++++++++++++++ compiler/stgSyn/CoreToStg.lhs | 4 ++ compiler/typecheck/Inst.lhs | 1 + compiler/typecheck/TcForeign.lhs | 53 ++++++++++++++++++-- compiler/typecheck/TcTyClsDecls.lhs | 3 +- configure.ac | 3 - ghc/ghc.mk | 1 - 18 files changed, 328 insertions(+), 107 deletions(-) _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc
