diff options
| author | Paul Eggert | 2011-03-01 20:40:07 -0800 |
|---|---|---|
| committer | Paul Eggert | 2011-03-01 20:40:07 -0800 |
| commit | 4a8b879b87962d5f37c05d3650f43cc571b22bc7 (patch) | |
| tree | 781d1cf60e3e49c820ffc7c8121dd5e7f9c86760 /doc/misc/ChangeLog | |
| parent | ba46f4d85a6938273f52a8cdf7e09d9afee61d7f (diff) | |
| parent | 8889f4e2c332b0ecedc9e6088252f4cbae301236 (diff) | |
| download | emacs-4a8b879b87962d5f37c05d3650f43cc571b22bc7.tar.gz emacs-4a8b879b87962d5f37c05d3650f43cc571b22bc7.zip | |
Merge from mainline.
Diffstat (limited to 'doc/misc/ChangeLog')
| -rw-r--r-- | doc/misc/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 2ce67bad6cb..47ae7ee3842 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2011-03-02 Glenn Morris <rgm@gnu.org> | ||
| 2 | |||
| 3 | * dired-x.texi (Omitting Variables): Refer to add-dir-local-variable | ||
| 4 | instead of the obsoleted dired-omit-here-always. | ||
| 5 | |||
| 1 | 2011-02-28 Michael Albinus <michael.albinus@gmx.de> | 6 | 2011-02-28 Michael Albinus <michael.albinus@gmx.de> |
| 2 | 7 | ||
| 3 | * tramp.texi (Frequently Asked Questions): Add Emacs 24 to | 8 | * tramp.texi (Frequently Asked Questions): Add Emacs 24 to |