[commit: haddock] T6018-injective-type-families, adamse-D1033, ghc-head, master, wip/10268, wip/10313, wip/D538, wip/D538-1, wip/D538-2, wip/D538-3, wip/D538-4, wip/D538-5, wip/D538-6, wip/D548-master, wip/D548-master-2, wip/T10483, wip/T9840, wip/api-annot-tweaks-7.10, wip/api-annots-ghc-7.10-3, wip/orf-reboot: Various fixups and bumps for next release (1739375)

Wed Jul 8 08:34:56 UTC 2015

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

On branches: T6018-injective-type-families,adamse-D1033,ghc-head,master,wip/10268,wip/10313,wip/D538,wip/D538-1,wip/D538-2,wip/D538-3,wip/D538-4,wip/D538-5,wip/D538-6,wip/D548-master,wip/D548-master-2,wip/T10483,wip/T9840,wip/api-annot-tweaks-7.10,wip/api-annots-ghc-7.10-3,wip/orf-reboot
Link       : http://git.haskell.org/haddock.git/commitdiff/1739375eb23342618a3ac01c46a9e4a48cabf716

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

commit 1739375eb23342618a3ac01c46a9e4a48cabf716
Author: Mateusz Kowalczyk <fuuzetsu at fuuzetsu.co.uk>
Date:   Fri Dec 12 07:48:42 2014 +0000

    Various fixups and bumps for next release

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

1739375eb23342618a3ac01c46a9e4a48cabf716
 .travis.yml                                    |  4 ++--
 CHANGES                                        |  2 +-
 ghc.mk                                         |  7 +++----
 haddock-api/haddock-api.cabal                  |  6 +++---
 haddock-api/src/Haddock/Backends/Hoogle.hs     |  2 +-
 haddock-api/src/Haddock/Backends/Xhtml.hs      |  3 ---
 haddock-api/src/Haddock/Backends/Xhtml/Decl.hs |  7 +++----
 haddock-api/src/Haddock/Interface/Create.hs    |  8 --------
 haddock-api/src/Haddock/InterfaceFile.hs       |  4 ++--
 haddock-library/haddock-library.cabal          |  2 +-
 haddock.cabal                                  | 10 ++++++----
 html-test/run.lhs                              |  2 +-
 12 files changed, 23 insertions(+), 34 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc 1739375eb23342618a3ac01c46a9e4a48cabf716