Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-kinds
http://hackage.haskell.org/trac/ghc/changeset/5bceb82e68d9c906032ffa27c5a6619a165c18d3 >--------------------------------------------------------------- commit 5bceb82e68d9c906032ffa27c5a6619a165c18d3 Merge: d66143f... d62b5b9... Author: Jose Pedro Magalhaes <[email protected]> Date: Wed Nov 2 09:40:48 2011 +0000 Merge branch 'ghc-kinds' of http://darcs.haskell.org/ghc into ghc-kinds compiler/prelude/TysPrim.lhs | 1 - compiler/typecheck/TcDeriv.lhs | 4 +- compiler/typecheck/TcHsSyn.lhs | 2 +- compiler/typecheck/TcHsType.lhs | 114 ++++++++++++++----------------- compiler/typecheck/TcInstDcls.lhs | 7 +- compiler/typecheck/TcMType.lhs | 127 +++++++++++++---------------------- compiler/typecheck/TcRnTypes.lhs | 6 +- compiler/typecheck/TcSimplify.lhs | 8 +-- compiler/typecheck/TcTyClsDecls.lhs | 5 +- compiler/typecheck/TcType.lhs | 15 ++++- compiler/typecheck/TcUnify.lhs | 4 +- compiler/types/Class.lhs | 3 +- compiler/types/TyCon.lhs | 2 +- 13 files changed, 134 insertions(+), 164 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
