[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: Follow API changes in D426 (7962951)

[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/79629515c0fd71baf182a487df94cb5eaa27ab47

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

commit 79629515c0fd71baf182a487df94cb5eaa27ab47
Author: Alan Zimmerman <alan.zimm at gmail.com>
Date:   Fri Nov 21 11:23:09 2014 -0600

    Follow API changes in D426
    
    Signed-off-by: Austin Seipp <aseipp at pobox.com>
    
    Conflicts:
    	haddock-api/src/Haddock/Backends/LaTeX.hs
    	haddock-api/src/Haddock/Backends/Xhtml/Decl.hs
    	haddock-api/src/Haddock/Convert.hs


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

79629515c0fd71baf182a487df94cb5eaa27ab47
 haddock-api/src/Haddock/Backends/Hoogle.hs     | 14 +++---
 haddock-api/src/Haddock/Backends/LaTeX.hs      | 29 +++++++-----
 haddock-api/src/Haddock/Backends/Xhtml/Decl.hs | 61 +++++++++++++++++---------
 haddock-api/src/Haddock/Convert.hs             |  7 ++-
 haddock-api/src/Haddock/GhcUtils.hs            | 33 +++++++-------
 haddock-api/src/Haddock/Interface/Create.hs    | 31 +++++++------
 haddock-api/src/Haddock/Interface/Rename.hs    | 26 ++++++-----
 haddock-api/src/Haddock/Utils.hs               |  7 ++-
 8 files changed, 120 insertions(+), 88 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 79629515c0fd71baf182a487df94cb5eaa27ab47