aboutsummaryrefslogtreecommitdiff
path: root/haddock-api/src/Haddock/Doc.hs
diff options
context:
space:
mode:
authorSimon Peyton Jones <simonpj@microsoft.com>2015-10-31 22:13:26 +0000
committerSimon Peyton Jones <simonpj@microsoft.com>2015-10-31 22:14:43 +0000
commit0413c544b60c063ef286777d3008c4e33b4afbcd (patch)
treedc78cd20cc9f41c5495afb4b14a3c5798b07d9a1 /haddock-api/src/Haddock/Doc.hs
parentb2d4b230c2446d241fd8730cd158e4fe6b7305df (diff)
parent987b5062482e20a032fb6358e655265b0b7a3cd2 (diff)
Merge remote-tracking branch 'origin/ghc-head' into wip/spj-wildcard-refactor
Conflicts: haddock-api/src/Haddock/Convert.hs
Diffstat (limited to 'haddock-api/src/Haddock/Doc.hs')
0 files changed, 0 insertions, 0 deletions