| commit | 6a788618e30fef787b439760065c122dfa8aad3f | |
| author | Nicolas Goaziou <n.goaziou@gmail.com> | |
| Thu, 30 May 2013 12:33:47 +0000 (30 14:33 +0200) | ||
| committer | Nicolas Goaziou <n.goaziou@gmail.com> | |
| Thu, 30 May 2013 12:33:47 +0000 (30 14:33 +0200) | ||
| tree | ef6d478db09f56651b57e82f7cd96a9f81229a03 | treesnapshot (tar.gz zip) |
| parent | 9d22167c68d6ff7cfedc4b5aa7d538deee515df2 | commitdiff |
| parent | 752a4eb49d1dff09b4a59e31bf29128a3202dc22 | commitdiff |
Merge branch 'maint'
Conflicts:
contrib/lisp/ox-deck.el
Conflicts:
contrib/lisp/ox-deck.el
| contrib/lisp/ox-deck.el | diff1 | diff2 | blobhistory |
| lisp/ox-latex.el | diff1 | diff2 | blobhistory |
| lisp/ox-texinfo.el | diff1 | diff2 | blobhistory |