Tissevert/pandoc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1
pandoc/benchmark
History
John MacFarlane 6a3a04c428 Merge branch 'errortype' of https://github.com/mpickering/pandoc into mpickering-errortype 
Conflicts:
	benchmark/benchmark-pandoc.hs
	src/Text/Pandoc/Readers/Markdown.hs
	src/Text/Pandoc/Readers/Org.hs
	src/Text/Pandoc/Readers/RST.hs
	tests/Tests/Readers/LaTeX.hs
2015-03-28 12:12:48 -07:00
..
benchmark-pandoc.hs Merge branch 'errortype' of https://github.com/mpickering/pandoc into mpickering-errortype 2015-03-28 12:12:48 -07:00