diff options
| author | John MacFarlane <jgm@berkeley.edu> | 2010-12-03 23:31:03 -0800 |
|---|---|---|
| committer | John MacFarlane <jgm@berkeley.edu> | 2010-12-03 23:43:47 -0800 |
| commit | 357b965b4455422cfdeb2676befda31d017f944f (patch) | |
| tree | 732d4ad686a0bacd2b50b60dc947aba7d84a020c /s5/default/slides.js.packed | |
| parent | bea62bcab8ff095057a38eb2b8ecfaa3c9efb9e7 (diff) | |
| parent | 38bc3f23166cc3b2088eebb8a234a3f5f5e65bbb (diff) | |
| download | pandoc-357b965b4455422cfdeb2676befda31d017f944f.tar.gz | |
Merge branch 'citeproc' into master.
Conflicts:
src/Text/Pandoc/Definition.hs
Diffstat (limited to 's5/default/slides.js.packed')
0 files changed, 0 insertions, 0 deletions