aboutsummaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorMax Bolingbroke <batterseapower@hotmail.com>2011-09-09 13:34:29 +0100
committerMax Bolingbroke <batterseapower@hotmail.com>2011-09-09 14:10:25 +0100
commit2fed1c8a1dd4ce5713dde980b3a6f717ea6d6d5e (patch)
tree6fbaaa22d77308e149dbaf66d7f3d9bc95c2ed2e /doc
parent0f21c474382af69bb7dac214d6c225218240e033 (diff)
parent7082a7c2278a963cc55cc5776618fbfe61f1fc77 (diff)
Merge branch 'no-pred-ty'
Conflicts: src/Haddock/Convert.hs
Diffstat (limited to 'doc')
0 files changed, 0 insertions, 0 deletions