From c7cf0ebc24d66371c8d48ad72f65e72a2a027f06 Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 8 Jan 2013 15:27:18 +0100 Subject: Merge Org 7.9.3 (commit 31c1aea) --- doc/misc/ChangeLog | 12 ++++++++++++ 1 file changed, 12 insertions(+) (limited to 'doc/misc/ChangeLog') diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 68b0c31916d..08e8cc3614a 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -1,3 +1,15 @@ +2013-01-08 Bastien Guerry + + * org.texi (Pushing to MobileOrg): Add footnote about using + symbolic links in `org-directory'. + (Timestamps, Deadlines and scheduling): Use `diary-float' instead + of the now obsolete alias `org-float'. + (TODO basics): Add `org-use-fast-todo-selection' to the variable + index. Fix description of TODO keywords cycling. + (Advanced features): Add missing argument for @item. + (Storing searches): Add index entries and a note about + *-tree agenda views. + 2013-01-06 Andreas Schwab * autotype.texi: Remove undefined command @subtitlefont. -- cgit v1.2.1 From 6d3e4c8092e5c5067bb80c194fdafe2d537ffbeb Mon Sep 17 00:00:00 2001 From: Bastien Guerry Date: Tue, 8 Jan 2013 16:31:30 +0100 Subject: Merge Org (commit c8c217). Fix mistake about updating the wrong ChangeLog. --- doc/misc/ChangeLog | 3 +++ 1 file changed, 3 insertions(+) (limited to 'doc/misc/ChangeLog') diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 08e8cc3614a..8d88336183d 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog @@ -9,6 +9,9 @@ (Advanced features): Add missing argument for @item. (Storing searches): Add index entries and a note about *-tree agenda views. + (Structure editing): Document `org-mark-element' and + `org-mark-subtree'. + (Tag inheritance): Document `org-agenda-use-tag-inheritance'. 2013-01-06 Andreas Schwab -- cgit v1.2.1