Repository : ssh://darcs.haskell.org//srv/darcs/ghc On branch : ghc-generics
http://hackage.haskell.org/trac/ghc/changeset/6ad311b7965a7af86f3b931b134215dff76f5fbb >--------------------------------------------------------------- commit 6ad311b7965a7af86f3b931b134215dff76f5fbb Merge: 2d4d636... d7fb8d3... Author: Jose Pedro Magalhaes <[email protected]> Date: Fri May 20 19:17:13 2011 +0200 Merge branch 'ghc-generics' of http://darcs.haskell.org/ghc into ghc-generics compiler/basicTypes/OccName.lhs | 8 ++-- compiler/iface/BuildTyCl.lhs | 3 +- compiler/main/HscTypes.lhs | 37 ++++++++--------- compiler/typecheck/TcInstDcls.lhs | 34 +++++++--------- compiler/typecheck/TcRnDriver.lhs | 1 - compiler/typecheck/TcTyClsDecls.lhs | 8 ++-- compiler/types/FamInstEnv.lhs | 7 +++- compiler/types/Generics.lhs | 76 +++++++++++++++++----------------- 8 files changed, 87 insertions(+), 87 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
