diff options
| author | Glenn Morris | 2009-01-09 03:22:30 +0000 |
|---|---|---|
| committer | Glenn Morris | 2009-01-09 03:22:30 +0000 |
| commit | 85dce46f7b48e9f29aef9984abd86f9ff1fb0e33 (patch) | |
| tree | 531b9d8a497891f3b924410bf3817b076114596c | |
| parent | 78892d1be9475a5b43bbc39def2f9c552e3adaf1 (diff) | |
| download | emacs-85dce46f7b48e9f29aef9984abd86f9ff1fb0e33.tar.gz emacs-85dce46f7b48e9f29aef9984abd86f9ff1fb0e33.zip | |
Fix merge error.
| -rw-r--r-- | lisp/gnus/ChangeLog | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/lisp/gnus/ChangeLog b/lisp/gnus/ChangeLog index f3404816ad6..e0a68e182a6 100644 --- a/lisp/gnus/ChangeLog +++ b/lisp/gnus/ChangeLog | |||
| @@ -122,10 +122,6 @@ | |||
| 122 | 122 | ||
| 123 | * mm-util.el (mm-charset-override-alist): Declare for compiler. | 123 | * mm-util.el (mm-charset-override-alist): Declare for compiler. |
| 124 | 124 | ||
| 125 | 2008-12-16 Glenn Morris <rgm@gnu.org> | ||
| 126 | |||
| 127 | * mm-util.el (mm-charset-override-alist): Declare for compiler. | ||
| 128 | |||
| 129 | 2008-12-15 Katsumi Yamaoka <yamaoka@jpl.org> | 125 | 2008-12-15 Katsumi Yamaoka <yamaoka@jpl.org> |
| 130 | 126 | ||
| 131 | * mml.el (mml-generate-mime-1): Prefer the MIME charset that Emacs | 127 | * mml.el (mml-generate-mime-1): Prefer the MIME charset that Emacs |