Repository : ssh://darcs.haskell.org//srv/darcs/haddock On branch : master
http://hackage.haskell.org/trac/ghc/changeset/730d3e622268f59fd78d29026d164486c4e68fcb >--------------------------------------------------------------- commit 730d3e622268f59fd78d29026d164486c4e68fcb Merge: 8285138... cc86b10... Author: Simon Peyton Jones <[email protected]> Date: Sat Mar 17 01:04:05 2012 +0000 Merge branch 'master' of http://darcs.haskell.org//haddock Conflicts: src/Haddock/Convert.hs src/Haddock/Backends/Xhtml/Decl.hs | 2 +- src/Haddock/Convert.hs | 2 +- src/Haddock/Interface/Rename.hs | 15 +++++++++------ 3 files changed, 11 insertions(+), 8 deletions(-) _______________________________________________ Cvs-ghc mailing list [email protected] http://www.haskell.org/mailman/listinfo/cvs-ghc
