diff options
| author | Paul Eggert | 2011-11-01 23:13:15 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-11-01 23:13:15 -0700 |
| commit | 3616c8b26bfaf024d803371b85bee571cd6f061f (patch) | |
| tree | bd7b5e6e3560b0496c144b13b44c1917cb9de8dc /doc/misc/ChangeLog | |
| parent | 5b0d046d5b6a6743be6888d02352b878151e1d6c (diff) | |
| parent | db22a3c27b078148c26a9f50afca5454a68d37d1 (diff) | |
| download | emacs-3616c8b26bfaf024d803371b85bee571cd6f061f.tar.gz emacs-3616c8b26bfaf024d803371b85bee571cd6f061f.zip | |
Merge from trunk.
Diffstat (limited to 'doc/misc/ChangeLog')
| -rw-r--r-- | doc/misc/ChangeLog | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 10a0d5e7a91..029406e2d30 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog | |||
| @@ -1,3 +1,7 @@ | |||
| 1 | 2011-10-31 Katsumi Yamaoka <yamaoka@jpl.org> | ||
| 2 | |||
| 3 | * gnus.texi (Other Gnus Versions): Remove. | ||
| 4 | |||
| 1 | 2011-10-28 Alan Mackenzie <acm@muc.de> | 5 | 2011-10-28 Alan Mackenzie <acm@muc.de> |
| 2 | 6 | ||
| 3 | * cc-mode.texi (Indentation Commands): Mention "macros with semicolons". | 7 | * cc-mode.texi (Indentation Commands): Mention "macros with semicolons". |
| @@ -6,9 +10,8 @@ | |||
| 6 | "Macros with ;". | 10 | "Macros with ;". |
| 7 | (Macros with ;): New page. | 11 | (Macros with ;): New page. |
| 8 | 12 | ||
| 9 | * progmodes/cc-mode.texi (Movement Commands): Document | 13 | * cc-mode.texi (Movement Commands): Document `c-defun-tactic'. |
| 10 | `c-defun-tactic'. Document the new handling of nested scopes for | 14 | Document the new handling of nested scopes for movement by defuns. |
| 11 | movement by defuns. | ||
| 12 | 15 | ||
| 13 | 2011-10-23 Michael Albinus <michael.albinus@gmx.de> | 16 | 2011-10-23 Michael Albinus <michael.albinus@gmx.de> |
| 14 | 17 | ||