[commit: haddock] ghc-7.6: Merge branch 'hiddenInstances2' of http://github.com/feuerbach/haddock into ghc-7.6 (81b9440)

[David Waern]

Repository : ssh://darcs.haskell.org//srv/darcs/haddock

On branch  : ghc-7.6

http://hackage.haskell.org/trac/ghc/changeset/81b9440ce14377c3be69fe01adf12471540676f1

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

commit 81b9440ce14377c3be69fe01adf12471540676f1
Merge: a427422... 8fe6416...
Author: David Waern <david.waern at gmail.com>
Date:   Fri Sep 7 10:38:50 2012 +0200

    Merge branch 'hiddenInstances2' of http://github.com/feuerbach/haddock into ghc-7.6

 src/Haddock/Interface.hs                           |    7 +-
 src/Haddock/Interface/AttachInstances.hs           |   55 +++++++++-
 tests/html-tests/tests/HiddenInstances.hs          |   35 ++++++
 .../{Bug7.html.ref => HiddenInstances.html.ref}    |  114 ++++++++++----------
 tests/html-tests/tests/HiddenInstancesA.hs         |   17 +++
 tests/html-tests/tests/HiddenInstancesB.hs         |    2 +
 .../{Bug7.html.ref => HiddenInstancesB.html.ref}   |   66 +++--------
 7 files changed, 182 insertions(+), 114 deletions(-)