diff options
author | David Waern <david.waern@gmail.com> | 2012-07-23 16:50:40 +0200 |
---|---|---|
committer | David Waern <david.waern@gmail.com> | 2012-07-23 16:50:40 +0200 |
commit | c3811c56988ecae6c3d3b2c4c202474de012e9ed (patch) | |
tree | c7d897e98c3523d056d38745b794c681b30a38f6 /html/Ocean.std-theme/synopsis.png | |
parent | 83a2a6ab67b25eec42c50b99b0b594313b8abe44 (diff) | |
parent | 0730c1b4088fd5d2c36671b0adf3c9e11222e233 (diff) |
Merge branch 'dev' of https://github.com/sol/haddock into ghc-7.6
Conflicts:
src/Haddock/InterfaceFile.hs
Diffstat (limited to 'html/Ocean.std-theme/synopsis.png')
0 files changed, 0 insertions, 0 deletions