aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorDavid Waern <david.waern@gmail.com>2011-12-27 13:33:41 +0100
committerDavid Waern <david.waern@gmail.com>2011-12-27 13:33:41 +0100
commit12e619d5b00d205443768c224da2bfb045569590 (patch)
tree4c50f7e3a3d8e34b70b6d6b80dd42d191284ba50 /doc
parent505df72e9e0962e01cf031f799d8d8940ced73b1 (diff)
parent60a043541e062ff6ceb52b0ab9e4f67d79dd3754 (diff)
Merge ../../../haddock
Conflicts: src/Haddock/InterfaceFile.hs
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions