Repository : ssh://darcs.haskell.org//srv/darcs/haddock2 On branch : ghc-generics
http://hackage.haskell.org/trac/ghc/changeset/6f92cdd12d1354dfbd80f8323ca333bea700896a >--------------------------------------------------------------- commit 6f92cdd12d1354dfbd80f8323ca333bea700896a Merge: f420cc4... 28df3a1... Author: Simon Peyton Jones <[email protected]> Date: Thu May 19 17:54:34 2011 +0100 Merge remote branch 'origin/master' into ghc-generics src/Haddock/Convert.hs | 40 ++++++++++++++++++++++------- src/Haddock/Interface/AttachInstances.hs | 3 +- src/Haddock/Interface/Rn.hs | 4 +- src/Main.hs | 22 ++++++++-------- 4 files changed, 45 insertions(+), 24 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
