diff options
| author | Glenn Morris | 2012-04-20 09:27:52 -0700 |
|---|---|---|
| committer | Glenn Morris | 2012-04-20 09:27:52 -0700 |
| commit | 61bb069e8c230357017be65d59ccea36c3cd91b1 (patch) | |
| tree | c1d2237d803eaf5293462793adce4045d8d8a883 /doc/misc/ChangeLog | |
| parent | 4ae29f89bec2dda2c891bba212d1918b1375421b (diff) | |
| download | emacs-61bb069e8c230357017be65d59ccea36c3cd91b1.tar.gz emacs-61bb069e8c230357017be65d59ccea36c3cd91b1.zip | |
Fix up merged ChangeLog entries
Diffstat (limited to 'doc/misc/ChangeLog')
| -rw-r--r-- | doc/misc/ChangeLog | 15 |
1 files changed, 0 insertions, 15 deletions
diff --git a/doc/misc/ChangeLog b/doc/misc/ChangeLog index 20c453544bc..14f389044bb 100644 --- a/doc/misc/ChangeLog +++ b/doc/misc/ChangeLog | |||
| @@ -3,21 +3,6 @@ | |||
| 3 | * faq.texi (New in Emacs 24): New section. | 3 | * faq.texi (New in Emacs 24): New section. |
| 4 | (Packages that do not come with Emacs): Mention M-x list-packages. | 4 | (Packages that do not come with Emacs): Mention M-x list-packages. |
| 5 | 5 | ||
| 6 | 2012-04-20 Glenn Morris <rgm@gnu.org> | ||
| 7 | |||
| 8 | * Makefile.in: Replace non-portable use of $< in emacs-gnutls rules. | ||
| 9 | |||
| 10 | 2012-04-20 Eli Zaretskii <eliz@gnu.org> | ||
| 11 | |||
| 12 | * makefile.w32-in (INFO_TARGETS, DVI_TARGETS, clean): Add emacs-gnutls. | ||
| 13 | ($(infodir)/emacs-gnutls, emacs-gnutls.dvi): New targets. | ||
| 14 | |||
| 15 | 2012-04-20 Teodor Zlatanov <tzz@lifelogs.com> | ||
| 16 | |||
| 17 | * emacs-gnutls.texi: Add documentation for the GnuTLS integration. | ||
| 18 | * Makefile.in: Add emacs-gnutls.texi to build. | ||
| 19 | |||
| 20 | 2012-04-20 Alan Mackenzie <acm@muc.de> | ||
| 21 | 2012-04-14 Alan Mackenzie <acm@muc.de> | 6 | 2012-04-14 Alan Mackenzie <acm@muc.de> |
| 22 | 7 | ||
| 23 | * cc-mode.texi (c-offsets-alist): Correct a typo. | 8 | * cc-mode.texi (c-offsets-alist): Correct a typo. |