Mercurial > emacs
diff etc/ChangeLog @ 112229:41f5a96a1e35
ChangeLog merge fixes.
author | Glenn Morris <rgm@gnu.org> |
---|---|
date | Fri, 14 Jan 2011 09:42:40 -0800 |
parents | 417b1e4d63cd |
children | 67bea318ed68 |
line wrap: on
line diff
--- a/etc/ChangeLog Fri Jan 14 12:18:41 2011 -0500 +++ b/etc/ChangeLog Fri Jan 14 09:42:40 2011 -0800 @@ -12,11 +12,6 @@ * refcards/vipcard.tex, refcards/viperCard.tex: Update short copyright year to 2011. -2011-01-14 Kenichi Handa <handa@m17n.org> - - * NEWS: Describe the changes for rmail's MIME handling. - -2011-01-14 W. Martin Borgert <debacle@debian.org> (tiny change) 2011-01-13 Christian Ohler <ohler@gnu.org> * NEWS: Mention ERT.