Mon Nov 20 20:56:13 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/T11028,wip/T11028-2,wip/T11028-3,wip/T11080-open-data-kinds,wip/T11258,wip/T11430,wip/T12105,wip/T12105-2,wip/T12942,wip/T13163,wip/T3384,wip/embelleshed-rdr,wip/new-tree-one-param,wip/rae,wip/rae-nokinds,wip/remove-frames,wip/remove-frames1,wip/revert-ttg-2017-11-20,wip/spj-wildcard-refactor,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/0413c544b60c063ef286777d3008c4e33b4afbcd

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

commit 0413c544b60c063ef286777d3008c4e33b4afbcd
Merge: b2d4b23 987b506
Author: Simon Peyton Jones <simonpj at microsoft.com>
Date:   Sat Oct 31 22:13:26 2015 +0000

    Merge remote-tracking branch 'origin/ghc-head' into wip/spj-wildcard-refactor
    
    Conflicts:
    	haddock-api/src/Haddock/Convert.hs


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

0413c544b60c063ef286777d3008c4e33b4afbcd
 haddock-api/haddock-api.cabal         |  2 +-
 haddock-api/src/Haddock/Convert.hs    | 69 ++++++++++++++++-------------------
 haddock-library/haddock-library.cabal |  2 +-
 haddock.cabal                         |  2 +-
 4 files changed, 35 insertions(+), 40 deletions(-)