summaryrefslogtreecommitdiff
path: root/README
diff options
context:
space:
mode:
authorJohn MacFarlane <jgm@berkeley.edu>2014-12-15 09:30:01 -0800
committerJohn MacFarlane <jgm@berkeley.edu>2014-12-15 10:01:50 -0800
commit544f3e5b45c7452c7bb90a630ec0904c4808113e (patch)
tree37e5003f274bcf90d239aea8593c54436e8e0b82 /README
parentd009646de7b5795cd5985ba0a5fe70e5b2c57df6 (diff)
parent08d80809c20408701b2ccf57d561196e9743269e (diff)
Merge branch 'use-texorpdfstring' of https://github.com/wilx/pandoc into wilx-use-texorpdfstring
Conflicts: src/Text/Pandoc/Writers/LaTeX.hs tests/Tests/Writers/LaTeX.hs
Diffstat (limited to 'README')
0 files changed, 0 insertions, 0 deletions