Skip to content
Snippets Groups Projects
Commit 160f23d4 authored by Simon Peyton Jones's avatar Simon Peyton Jones
Browse files

Merge branch 'master' into ghc-new-co 

Conflicts:
	src/Haddock/Backends/LaTeX.hs
	src/Haddock/Backends/Xhtml/Decl.hs
	src/Haddock/Convert.hs
	src/Haddock/Interface/Rename.hs
parents f6c4fd19 53a15353
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment