Mercurial > emacs
comparison lisp/gnus/ChangeLog @ 100996:4b04254322f8
Fix merge error.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Fri, 09 Jan 2009 03:22:30 +0000 |
parents | a16e9f7c2536 |
children | 0ffd7b9d2985 |
comparison
equal
deleted
inserted
replaced
100995:89695da9e88c | 100996:4b04254322f8 |
---|---|
115 | 115 |
116 2008-12-18 Reiner Steib <Reiner.Steib@gmx.de> | 116 2008-12-18 Reiner Steib <Reiner.Steib@gmx.de> |
117 | 117 |
118 * mml.el (mml-attach-file): Strip text properties from file name. | 118 * mml.el (mml-attach-file): Strip text properties from file name. |
119 (Bug#1574) | 119 (Bug#1574) |
120 | |
121 2008-12-16 Glenn Morris <rgm@gnu.org> | |
122 | |
123 * mm-util.el (mm-charset-override-alist): Declare for compiler. | |
124 | 120 |
125 2008-12-16 Glenn Morris <rgm@gnu.org> | 121 2008-12-16 Glenn Morris <rgm@gnu.org> |
126 | 122 |
127 * mm-util.el (mm-charset-override-alist): Declare for compiler. | 123 * mm-util.el (mm-charset-override-alist): Declare for compiler. |
128 | 124 |