Mon Nov 20 20:59:23 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/T11080-open-data-kinds,wip/T11430,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/a13d21c688cae176be4505a5a6e9d64739845ea3

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

commit a13d21c688cae176be4505a5a6e9d64739845ea3
Merge: 6ddd758 13e1eaf
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Wed Jan 6 14:35:00 2016 +0100

    Merge branch 'master' into ghc-head



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

a13d21c688cae176be4505a5a6e9d64739845ea3
 CHANGES                                  |  12 ++++
 driver-test/Main.hs                      |  12 ++++
 driver-test/ResponseFileSpec.hs          |  80 ++++++++++++++++++++++
 driver/Main.hs                           |  23 +------
 driver/ResponseFile.hs                   | 110 +++++++++++++++++++++++++++++++
 haddock-api/haddock-api.cabal            |   2 +-
 haddock-api/src/Haddock/InterfaceFile.hs |   2 +-
 haddock-library/haddock-library.cabal    |   2 +-
 haddock.cabal                            |  11 +++-
 9 files changed, 228 insertions(+), 26 deletions(-)

diff --cc haddock-api/src/Haddock/InterfaceFile.hs
index 1bc4ddb,f45589a..770b997

--- a/haddock-api/src/Haddock/InterfaceFile.hs
+++ b/haddock-api/src/Haddock/InterfaceFile.hs
@@@ -81,8 -81,8 +81,8 @@@ binaryInterfaceMagic = 0xD0Cfac
  -- (2) set `binaryInterfaceVersionCompatibility` to [binaryInterfaceVersion]
  --
  binaryInterfaceVersion :: Word16
 -#if (__GLASGOW_HASKELL__ >= 711) && (__GLASGOW_HASKELL__ < 801)
 +#if (__GLASGOW_HASKELL__ >= 801) && (__GLASGOW_HASKELL__ < 803)
- binaryInterfaceVersion = 27
+ binaryInterfaceVersion = 28
  
  binaryInterfaceVersionCompatibility :: [Word16]
  binaryInterfaceVersionCompatibility = [binaryInterfaceVersion]

