Tue Nov 28 11:44:44 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-located-module-as,wip/D2418,wip/T12105,wip/T12105-2,wip/T12942,wip/T13163,wip/T14529,wip/T3384,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/23f1420c64899fff2fe45a8b797e0d7e8c931c7d

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

commit 23f1420c64899fff2fe45a8b797e0d7e8c931c7d
Merge: e18d166 7dd4e19
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Feb 18 23:15:39 2016 +0100

    Merge remote-tracking branch 'origin/master' into ghc-head


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

23f1420c64899fff2fe45a8b797e0d7e8c931c7d
 haddock-api/src/Haddock/Backends/Xhtml/Decl.hs | 31 ++++++++++++++++++--------
 1 file changed, 22 insertions(+), 9 deletions(-)