Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : master
http://hackage.haskell.org/trac/ghc/changeset/4da767e24ea09e0708a43886f0ac9e777c7145f0 >--------------------------------------------------------------- commit 4da767e24ea09e0708a43886f0ac9e777c7145f0 Merge: 3d51f27... 5765248... Author: Simon Peyton Jones <simo...@microsoft.com> Date: Mon Jan 7 10:45:08 2013 +0000 Merge branch 'master' of darcs.haskell.org:/home/darcs/ghc compiler/iface/TcIface.lhs | 3 +- compiler/typecheck/FamInst.lhs | 115 +++++++------ compiler/typecheck/TcGenGenerics.lhs | 5 +- compiler/typecheck/TcInstDcls.lhs | 144 ++++++++++------ compiler/typecheck/TcMType.lhs | 16 ++- compiler/types/CoAxiom.lhs | 40 ++++- compiler/types/Coercion.lhs | 5 +- compiler/types/FamInstEnv.lhs | 186 +++++++++++++-------- compiler/vectorise/Vectorise/Generic/PAMethods.hs | 4 +- compiler/vectorise/Vectorise/Generic/PData.hs | 8 +- rts/ghc.mk | 4 + 11 files changed, 330 insertions(+), 200 deletions(-) _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc
