| commit | 3de3c470d8e12e923989de003016daef6c3bb053 | |
| author | Eric Schulte <eric.schulte@gmx.com> | |
| Sun, 19 Feb 2012 16:36:13 +0000 (19 09:36 -0700) | ||
| committer | Eric Schulte <eric.schulte@gmx.com> | |
| Sun, 19 Feb 2012 16:36:13 +0000 (19 09:36 -0700) | ||
| tree | 89120ca21f8a6705887c0bdbb978b4971d9d1dad | treesnapshot (tar.gz zip) |
| parent | 8fc0dc2f58c5521024e35856b4c05f0b1d9d9796 | commitdiff |
| parent | 8b7a3f249803aba612f9ad3ae50c2fc986247da4 | commitdiff |
Merge branch 'origin-maint'
Conflicts:
contrib/lisp/org-mac-link-grabber.el
doc/org.texi
lisp/org-odt.el
testing/lisp/test-ob.el
Conflicts:
contrib/lisp/org-mac-link-grabber.el
doc/org.texi
lisp/org-odt.el
testing/lisp/test-ob.el
| lisp/org-odt.el | diff1 | diff2 | blobhistory |
| testing/lisp/test-ob.el | diff1 | diff2 | blobhistory |