diff options
| author | Glenn Morris | 2008-03-29 22:43:16 +0000 |
|---|---|---|
| committer | Glenn Morris | 2008-03-29 22:43:16 +0000 |
| commit | d9ce91aecbf87ac6c6ce91e5f0d219cf3e60b15c (patch) | |
| tree | 7ca39369d28ffe6d1c0486019fc9a29ad7c48ea0 | |
| parent | fa98585ca3779749f7acadf5eaa321c03f7b0b8e (diff) | |
| download | emacs-d9ce91aecbf87ac6c6ce91e5f0d219cf3e60b15c.tar.gz emacs-d9ce91aecbf87ac6c6ce91e5f0d219cf3e60b15c.zip | |
Fix merge mistake.
| -rw-r--r-- | lisp/gnus/ChangeLog | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index 2a2b5b9bc2d..e908b8f2761 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog | |||
| @@ -63,11 +63,6 @@ | |||
| 63 | * gnus-win.el (gnus-configure-frame, gnus-all-windows-visible-p): | 63 | * gnus-win.el (gnus-configure-frame, gnus-all-windows-visible-p): |
| 64 | Prefer fboundp to functionp so it works with macros as well. | 64 | Prefer fboundp to functionp so it works with macros as well. |
| 65 | 65 | ||
| 66 | 2008-03-19 Glenn Morris <rgm@gnu.org> | ||
| 67 | |||
| 68 | * tls.el (open-tls-stream): Restore use of `tls-end-of-info'. | ||
| 69 | Accidentally removed in the sync process with Emacs. | ||
| 70 | |||
| 71 | 2008-03-19 Reiner Steib <Reiner.Steib@gmx.de> | 66 | 2008-03-19 Reiner Steib <Reiner.Steib@gmx.de> |
| 72 | 67 | ||
| 73 | * message.el (message-alter-recipients-discard-bogus-full-name): New | 68 | * message.el (message-alter-recipients-discard-bogus-full-name): New |