| commit | 6400c9a8e5c4eac490970425ad321f8a163bbab6 | |
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | |
| Mon, 11 Aug 2014 13:00:57 +0000 (11 15:00 +0200) | ||
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | |
| Mon, 11 Aug 2014 13:00:57 +0000 (11 15:00 +0200) | ||
| tree | f9e6c26514f4d87fe3c9ef0ff5051fd14f7e2047 | treesnapshot (tar.gz zip) |
| parent | f85aeea69f926869981aecf41aeb49945e997c12 | commitdiff |
| parent | 595cfd57dc4c04b4d89d2bb7a0aee34ed04119c8 | commitdiff |
Merge branch 'maint'
Conflicts:
doc/org.texi
lisp/ox-texinfo.el
Conflicts:
doc/org.texi
lisp/ox-texinfo.el
| doc/org.texi | diff1 | diff2 | blobhistory |
| lisp/ox-texinfo.el | diff1 | diff2 | blobhistory |