[commit: haddock] wip/D2418: Merge remote-tracking branch 'origin/ghc-head' into wip/D2418 (952d4bf)

[git at git.haskell.org]

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

On branch  : wip/D2418
Link       : http://git.haskell.org/haddock.git/commitdiff/952d4bfc4f99330aa74165b06ec64cd91dcd7b58

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

commit 952d4bfc4f99330aa74165b06ec64cd91dcd7b58
Merge: 1c942c8 cdc81a1
Author: Simon Marlow <marlowsd at gmail.com>
Date:   Fri Jul 22 11:38:17 2016 +0100

    Merge remote-tracking branch 'origin/ghc-head' into wip/D2418
    
    * origin/ghc-head:
      Add support for unboxed sums



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

952d4bfc4f99330aa74165b06ec64cd91dcd7b58
 haddock-api/src/Haddock/Backends/LaTeX.hs       | 5 +++++
 haddock-api/src/Haddock/Backends/Xhtml/Decl.hs  | 4 ++++
 haddock-api/src/Haddock/Backends/Xhtml/Utils.hs | 6 +++++-
 haddock-api/src/Haddock/Interface/Rename.hs     | 1 +
 haddock-api/src/Haddock/Interface/Specialize.hs | 1 +
 5 files changed, 16 insertions(+), 1 deletion(-)