diff options
| author | Bastien Guerry | 2013-01-08 16:31:30 +0100 |
|---|---|---|
| committer | Bastien Guerry | 2013-01-08 16:31:30 +0100 |
| commit | 6d3e4c8092e5c5067bb80c194fdafe2d537ffbeb (patch) | |
| tree | f9115fbdc6e42a73b57e20a27334057b80275814 /doc/misc/ChangeLog | |
| parent | c7cf0ebc24d66371c8d48ad72f65e72a2a027f06 (diff) | |
| download | emacs-6d3e4c8092e5c5067bb80c194fdafe2d537ffbeb.tar.gz emacs-6d3e4c8092e5c5067bb80c194fdafe2d537ffbeb.zip | |
Merge Org (commit c8c217). Fix mistake about updating the wrong ChangeLog.
Diffstat (limited to 'doc/misc/ChangeLog')
| -rw-r--r-- | doc/misc/ChangeLog | 3 |
1 files changed, 3 insertions, 0 deletions
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 @@ | |||
| 9 | (Advanced features): Add missing argument for @item. | 9 | (Advanced features): Add missing argument for @item. |
| 10 | (Storing searches): Add index entries and a note about | 10 | (Storing searches): Add index entries and a note about |
| 11 | *-tree agenda views. | 11 | *-tree agenda views. |
| 12 | (Structure editing): Document `org-mark-element' and | ||
| 13 | `org-mark-subtree'. | ||
| 14 | (Tag inheritance): Document `org-agenda-use-tag-inheritance'. | ||
| 12 | 15 | ||
| 13 | 2013-01-06 Andreas Schwab <schwab@linux-m68k.org> | 16 | 2013-01-06 Andreas Schwab <schwab@linux-m68k.org> |
| 14 | 17 | ||