diff options
| author | Eli Zaretskii | 2013-12-11 19:06:50 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2013-12-11 19:06:50 +0200 |
| commit | 0ec6c340e90369b5921b35bed3bd4cfc0368723e (patch) | |
| tree | 45429c2b0746b5c218c91bf557a93859d359f8f8 /doc | |
| parent | a34a8cd1e46594c5776f187dd98583bcb82f9bc0 (diff) | |
| parent | 3ef8e0d150e8a9c820323851bb2ad4d53170a9e8 (diff) | |
| download | emacs-0ec6c340e90369b5921b35bed3bd4cfc0368723e.tar.gz emacs-0ec6c340e90369b5921b35bed3bd4cfc0368723e.zip | |
Another merge from trunk.
Diffstat (limited to 'doc')
| -rw-r--r-- | doc/misc/ChangeLog | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 83e681990aa..3a8fe5b540d 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog | |||
| @@ -1,3 +1,12 @@ | |||
| 1 | 2013-12-11 Rüdiger Sonderfeld <ruediger@c-plusplus.de> | ||
| 2 | |||
| 3 | * Makefile.in: Add octave-mode.texi. | ||
| 4 | |||
| 5 | 2013-12-11 Kurt Hornik <Kurt.Hornik@wu-wien.ac.at> | ||
| 6 | Rüdiger Sonderfeld <ruediger@c-plusplus.de> | ||
| 7 | |||
| 8 | * octave-mode.texi: Import from GNU Octave (doc/interpreter/emacs.txi). | ||
| 9 | |||
| 1 | 2013-12-08 Juanma Barranquero <lekktu@gmail.com> | 10 | 2013-12-08 Juanma Barranquero <lekktu@gmail.com> |
| 2 | 11 | ||
| 3 | * dbus.texi (Properties and Annotations): Fix typo. | 12 | * dbus.texi (Properties and Annotations): Fix typo. |