Repository : ssh://darcs.haskell.org//srv/darcs/haddock On branch : overlapping-tyfams
http://hackage.haskell.org/trac/ghc/changeset/84fac41e500f46571a73271b286194d4644ff37d >--------------------------------------------------------------- commit 84fac41e500f46571a73271b286194d4644ff37d Merge: e2804a8... 2ad3ed1... Author: Richard Eisenberg <e...@cis.upenn.edu> Date: Sun Sep 9 23:23:56 2012 +0200 Merge branch 'master' into overlapping-tyfams haddock.cabal | 1 + src/Haddock/Interface/Create.hs | 54 ++++++++++++++++++++------------ src/Haddock/Interface/LexParseRn.hs | 4 ++- src/Haddock/Types.hs | 58 +++++++++++++++++----------------- 4 files changed, 66 insertions(+), 51 deletions(-) _______________________________________________ Cvs-ghc mailing list Cvs-ghc@haskell.org http://www.haskell.org/mailman/listinfo/cvs-ghc