Commit graph

13 commits

Author SHA1 Message Date
Glenn Morris
4ff933dd26 * org-version.el (org-odt-data-dir): Remove incorrect, duplicate definition.
Fixes: debbugs:16734
2014-02-25 13:10:52 -05:00
Bastien Guerry
3c8b09ca2e Merge Org version 8.2.5c. 2014-01-07 14:22:53 +01:00
Bastien Guerry
271672fad7 Merge Org version 8.2.3a. 2013-11-12 14:06:26 +01:00
Bastien Guerry
8a28a5b8d8 Merge latest Org fixes (commit 7524ef2). 2013-02-28 01:31:26 +01:00
Bastien Guerry
d351707783 Merge Org 7.9.3e (commit b07a9bb). 2013-02-07 08:11:59 +01:00
Bastien Guerry
a89c8ef024 Merge Org 7.9.3d (commit e8f5b0ad). 2013-01-13 11:33:16 +01:00
Bastien Guerry
2e3c2398e3 Merge Org up to commit 4cac75153. Some ChangeLog formatting fixes. 2013-01-08 19:49:37 +01:00
Bastien Guerry
6d3e4c8092 Merge Org (commit c8c217). Fix mistake about updating the wrong ChangeLog. 2013-01-08 16:31:30 +01:00
Bastien Guerry
c7cf0ebc24 Merge Org 7.9.3 (commit 31c1aea) 2013-01-08 15:27:18 +01:00
Bastien Guerry
63aa098259 Merge upstream Org (from commit 488eea) 2012-12-12 17:47:07 +01:00
Bastien Guerry
00323fb326 Fix overwritten typos and Org version number. 2012-10-26 17:27:29 +02:00
Bastien Guerry
bdebdb64b3 Merge upstream Org (from commit acbbe2) 2012-10-26 16:42:05 +02:00
Bastien Guerry
8223b1d233 Sync Org 7.9.2 from the commit tagged "release_7.9.2" in Org's Git repo. 2012-09-30 17:14:59 +02:00