[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: Revert "Merge branch 'reverts'" (e1156b5)

[git at git.haskell.org]

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/e1156b56e4711546956f5588b7b4258cb42caaac

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

commit e1156b56e4711546956f5588b7b4258cb42caaac
Author: Mateusz Kowalczyk <fuuzetsu at fuuzetsu.co.uk>
Date:   Fri Dec 12 06:22:31 2014 +0000

    Revert "Merge branch 'reverts'"
    
    This reverts commit 5c93cc347773c7634321edd5f808d5b55b46301f, reversing
    changes made to 5b81a9e53894d2ae591ca0c6c96199632d39eb06.
    
    Conflicts:
    	haddock-api/src/Haddock/Convert.hs


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

e1156b56e4711546956f5588b7b4258cb42caaac
 haddock-api/src/Haddock.hs                       | 10 ++++----
 haddock-api/src/Haddock/Backends/Xhtml.hs        |  2 +-
 haddock-api/src/Haddock/Backends/Xhtml/Decl.hs   |  4 +--
 haddock-api/src/Haddock/Backends/Xhtml/Layout.hs |  2 +-
 haddock-api/src/Haddock/Backends/Xhtml/Types.hs  |  2 +-
 haddock-api/src/Haddock/Convert.hs               | 12 ++++-----
 haddock-api/src/Haddock/GhcUtils.hs              | 16 ++++++------
 haddock-api/src/Haddock/Interface/Create.hs      | 16 ++++++------
 haddock-api/src/Haddock/Interface/Rename.hs      | 32 +++++++++++++++++-------
 haddock-api/src/Haddock/InterfaceFile.hs         | 12 ++++-----
 haddock-api/src/Haddock/ModuleTree.hs            |  6 ++---
 haddock-api/src/Haddock/Types.hs                 |  2 +-
 haddock-api/src/Haddock/Utils.hs                 |  6 +----
 html-test/run.lhs                                |  2 +-
 latex-test/run.lhs                               |  2 +-
 15 files changed, 67 insertions(+), 59 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 e1156b56e4711546956f5588b7b4258cb42caaac