Tue Nov 28 11:48:38 UTC 2017

Repository : ssh://git@git.haskell.org/haddock

On branches: alexbiehl-patch-1,ghc-head,ghc-head1,haddock-quick,headdock-library-1.4.5,ie_avails,master,pr-filter-maps,pr/cabal-desc,travis,v2.18,wip/T13163,wip/T14529,wip/embelleshed-rdr,wip/new-tree-one-param,wip/rae,wip/remove-frames,wip/remove-frames1,wip/revert-ttg-2017-11-20,wip/ttg-2017-10-13,wip/ttg-2017-10-31,wip/ttg-2017-11-06,wip/ttg2-2017-11-10,wip/ttg3-2017-11-12,wip/ttg4-constraints-2017-11-13,wip/ttg6-unrevert-2017-11-22
Link       : http://git.haskell.org/haddock.git/commitdiff/f951caf888eabd8742059f26e516e3392658fc88

>---------------------------------------------------------------

commit f951caf888eabd8742059f26e516e3392658fc88
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Fri Dec 9 19:56:39 2016 +0200

    Matching changes for GHC wip/T12942

>---------------------------------------------------------------

f951caf888eabd8742059f26e516e3392658fc88
 haddock-api/src/Haddock/Backends/Hoogle.hs         |  3 ++-
 .../src/Haddock/Backends/Hyperlinker/Ast.hs        |  2 +-
 haddock-api/src/Haddock/Backends/Xhtml.hs          |  2 +-
 haddock-api/src/Haddock/Backends/Xhtml/Decl.hs     |  2 +-
 haddock-api/src/Haddock/Backends/Xhtml/Names.hs    |  2 +-
 haddock-api/src/Haddock/Convert.hs                 | 11 +++++++--
 haddock-api/src/Haddock/Interface/Rename.hs        | 28 ++++++++++++++--------
 haddock-api/src/Haddock/Types.hs                   |  2 +-
 8 files changed, 34 insertions(+), 18 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc f951caf888eabd8742059f26e516e3392658fc88