| commit | 74ef099f2c900f1d034add106d6682a617127210 | |
| author | Luis Anaya <papoanaya@hotmail.com> | |
| Sat, 22 Sep 2012 09:45:49 +0000 (22 05:45 -0400) | ||
| committer | Luis Anaya <papoanaya@hotmail.com> | |
| Sat, 22 Sep 2012 09:45:49 +0000 (22 05:45 -0400) | ||
| tree | 5df91e9d69f144bfa36729d5d3158be271c4bcd8 | treesnapshot (tar.gz zip) |
| parent | 2a87c94c9f3e5176b6ad4ae6d5bcd2b6992d456e | commitdiff |
| parent | a5cf105b4436ef801fa022a8df2a55070c0bf96e | commitdiff |
Merge branch 'master' of orgmode.org:org-mode
Conflicts:
contrib/lisp/org-e-groff.el
Conflicts:
contrib/lisp/org-e-groff.el
| contrib/lisp/org-e-groff.el | diff1 | diff2 | blobhistory |