Tue Nov 28 11:42:55 UTC 2017

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

On branches: 2.17.3.1-spanfix,alexbiehl-patch-1,ghc-8.0,ghc-8.0-facebook,ghc-head,ghc-head1,haddock-quick,headdock-library-1.4.5,ie_avails,issue-303,issue-475,master,pr-filter-maps,pr/cabal-desc,travis,v2.17,v2.17.3,v2.18,wip-located-module-as,wip/D2418,wip/T11080-open-data-kinds,wip/T11430,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/975e77c29b12c2a72127eb3a13929291ff163f61

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

commit 975e77c29b12c2a72127eb3a13929291ff163f61
Merge: 39f8365 fef5e32
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Wed Dec 23 14:18:51 2015 +0100

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


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

975e77c29b12c2a72127eb3a13929291ff163f61
 haddock-api/src/Haddock/Backends/LaTeX.hs      | 4 +---
 haddock-api/src/Haddock/Backends/Xhtml/Decl.hs | 7 ++-----
 haddock-api/src/Haddock/Convert.hs             | 2 +-
 haddock-api/src/Haddock/Interface/Rename.hs    | 1 -
 haddock-api/src/Haddock/InterfaceFile.hs       | 2 +-
 haddock.cabal                                  | 2 +-
 6 files changed, 6 insertions(+), 12 deletions(-)