aboutsummaryrefslogtreecommitdiff
path: root/tests/tables.opendocument
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2010-11-27 10:52:44 -0800
committerJohn MacFarlane <jgm@berkeley.edu>2010-11-27 10:52:44 -0800
commitc989bf028fa226acb7b03039d0d77ef1e6a4700e (patch)
tree70c5d3af464d52e7d905f1039fdf3c37655ff8ef /tests/tables.opendocument
parentf0b7945b2007fa2356f638864ca644bb851b0c18 (diff)
parent71c9316a597298415a7d4cb7f758b523ac9339cd (diff)
downloadpandoc-c989bf028fa226acb7b03039d0d77ef1e6a4700e.tar.gz
Merge branch 'textile'
Conflicts: README man/man1/pandoc.1.md pandoc.cabal
Diffstat (limited to 'tests/tables.opendocument')
0 files changed, 0 insertions, 0 deletions