| commit | b1406dcddb6ae8abe7a8b14614cb91a94c55603f | |
| author | Nicolas Goaziou <mail@nicolasgoaziou.fr> | |
| Fri, 8 Aug 2014 20:07:45 +0000 (8 22:07 +0200) | ||
| committer | Nicolas Goaziou <mail@nicolasgoaziou.fr> | |
| Fri, 8 Aug 2014 20:07:45 +0000 (8 22:07 +0200) | ||
| tree | ac7445cac6dd9de5d91f3be29dfbb0512a260d83 | treesnapshot (tar.gz zip) |
| parent | fe133aadca22e2c0d102cccca9dca40c6fb209a0 | commitdiff |
| parent | 0d6c95699b82d4d0880632a59544dc291159ce19 | 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 |
| lisp/ox.el | diff1 | diff2 | blobhistory |