Tue Nov 28 11:43:15 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/94c127449fd25732ebda04a472cc5d99b4ce6481

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

commit 94c127449fd25732ebda04a472cc5d99b4ce6481
Merge: 116e56e d510c45
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Wed Jan 6 13:47:17 2016 +0100

    Merge remote-tracking branch 'randen/bug468'


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

94c127449fd25732ebda04a472cc5d99b4ce6481
 driver-test/Main.hs             |  12 +++++
 driver-test/ResponseFileSpec.hs |  80 +++++++++++++++++++++++++++++
 driver/Main.hs                  |  23 +--------
 driver/ResponseFile.hs          | 110 ++++++++++++++++++++++++++++++++++++++++
 haddock.cabal                   |   7 +++
 5 files changed, 210 insertions(+), 22 deletions(-)