Mon Nov 20 21:01: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/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
Link       : http://git.haskell.org/haddock.git/commitdiff/9760ee9efe22f0256d626bc567a7adfc754e9066

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

commit 9760ee9efe22f0256d626bc567a7adfc754e9066
Merge: 609018d 1f05bf7
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Wed May 11 16:03:44 2016 +0200

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


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

9760ee9efe22f0256d626bc567a7adfc754e9066
 haddock-api/haddock-api.cabal               |   2 +-
 haddock-api/src/Haddock/Interface/Create.hs |   2 +-
 haddock-library/haddock-library.cabal       |   2 +-
 haddock-test/src/Test/Haddock.hs            |  19 +-
 haddock-test/src/Test/Haddock/Process.hs    |   1 +
 haddock.cabal                               |  14 +-
 html-test/ref/Bug294.html                   |  76 ++-
 html-test/ref/Bug310.html                   |  20 +-
 html-test/ref/Instances.html                |  50 +-
 html-test/ref/PatternSyns.html              |  16 +-
 html-test/ref/Test.html                     |  26 +-
 html-test/ref/TypeFamilies.html             | 748 +++++++++++++++++++++-------
 html-test/ref/TypeFamilies2.html            | 124 ++++-
 13 files changed, 839 insertions(+), 261 deletions(-)