lee/pandoc
1
0
Fork 0
mirror of https://github.com/jgm/pandoc.git synced 2026-09-19 05:55:39 +00:00
Code Issues Packages Projects Releases Wiki Activity
Files
3f20fb3f9f8ccb2e6476e116e196b7e70ac559bb
pandoc/benchmark
T
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