diff options
| author | Glenn Morris | 2011-01-14 09:42:40 -0800 |
|---|---|---|
| committer | Glenn Morris | 2011-01-14 09:42:40 -0800 |
| commit | 15a1cca8ecc4b5a7330f377e608a34552fc9fc0a (patch) | |
| tree | 5a221e5aae726c74e1b9d019571c8c6c91914f65 /etc/ChangeLog | |
| parent | 77ab81d0545e980c57c0a35510ade29a9e43b4cd (diff) | |
| download | emacs-15a1cca8ecc4b5a7330f377e608a34552fc9fc0a.tar.gz emacs-15a1cca8ecc4b5a7330f377e608a34552fc9fc0a.zip | |
ChangeLog merge fixes.
Diffstat (limited to 'etc/ChangeLog')
| -rw-r--r-- | etc/ChangeLog | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/etc/ChangeLog b/etc/ChangeLog index 5e8b164ce05..27f0a28c9f4 100644 --- a/etc/ChangeLog +++ b/etc/ChangeLog | |||
| @@ -12,11 +12,6 @@ | |||
| 12 | * refcards/vipcard.tex, refcards/viperCard.tex: | 12 | * refcards/vipcard.tex, refcards/viperCard.tex: |
| 13 | Update short copyright year to 2011. | 13 | Update short copyright year to 2011. |
| 14 | 14 | ||
| 15 | 2011-01-14 Kenichi Handa <handa@m17n.org> | ||
| 16 | |||
| 17 | * NEWS: Describe the changes for rmail's MIME handling. | ||
| 18 | |||
| 19 | 2011-01-14 W. Martin Borgert <debacle@debian.org> (tiny change) | ||
| 20 | 2011-01-13 Christian Ohler <ohler@gnu.org> | 15 | 2011-01-13 Christian Ohler <ohler@gnu.org> |
| 21 | 16 | ||
| 22 | * NEWS: Mention ERT. | 17 | * NEWS: Mention ERT. |