[commit: haddock] 2.15, 2.15.0.1, 2.15.0.2, T6018-injective-type-families, adamse-D1033, clean, fix-travis, ghc-head, master, metainfo, v2.15, 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: Merge branch 'reverts' (5c93cc3)

[git at git.haskell.org]

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

On branches: 2.15,2.15.0.1,2.15.0.2,T6018-injective-type-families,adamse-D1033,clean,fix-travis,ghc-head,master,metainfo,v2.15,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/5c93cc347773c7634321edd5f808d5b55b46301f

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

commit 5c93cc347773c7634321edd5f808d5b55b46301f
Merge: 5b81a9e 6b00a11
Author: Mateusz Kowalczyk <fuuzetsu at fuuzetsu.co.uk>
Date:   Thu Aug 14 20:27:34 2014 +0100

    Merge branch 'reverts'
    
    This reverts any changes that were made to have Haddock compile with
    7.9. When 7.10 release comes, we can simply re-apply all the patches and
    any patches that occur on ghc-head branch from now on.
    
    This allows us to build master with 7.8.3



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

5c93cc347773c7634321edd5f808d5b55b46301f
 html-test/run.lhs                    |  2 +-
 latex-test/run.lhs                   |  2 +-
 src/Haddock.hs                       | 10 +++++-----
 src/Haddock/Backends/Xhtml.hs        |  2 +-
 src/Haddock/Backends/Xhtml/Decl.hs   |  4 ++--
 src/Haddock/Backends/Xhtml/Layout.hs |  2 +-
 src/Haddock/Backends/Xhtml/Types.hs  |  2 +-
 src/Haddock/Convert.hs               | 12 ++++++------
 src/Haddock/GhcUtils.hs              | 16 ++++++++--------
 src/Haddock/Interface/Create.hs      | 16 +++++++++-------
 src/Haddock/Interface/Rename.hs      | 32 +++++++++-----------------------
 src/Haddock/InterfaceFile.hs         | 12 ++++++------
 src/Haddock/ModuleTree.hs            |  6 +++---
 src/Haddock/Types.hs                 |  2 +-
 src/Haddock/Utils.hs                 |  6 +++++-
 15 files changed, 59 insertions(+), 67 deletions(-)