diff etc/ChangeLog @ 112228:417b1e4d63cd

Merge from emacs-23
author Stefan Monnier <monnier@iro.umontreal.ca>
date Fri, 14 Jan 2011 12:18:41 -0500
parents c5917804ecad 1e3cae16f7b0
children 41f5a96a1e35
line wrap: on
line diff
--- a/etc/ChangeLog	Fri Jan 14 16:06:17 2011 +0100
+++ b/etc/ChangeLog	Fri Jan 14 12:18:41 2011 -0500
@@ -1,3 +1,22 @@
+2011-01-14  Glenn Morris  <rgm@gnu.org>
+
+	* refcards/calccard.tex, refcards/cs-dired-ref.tex:
+	* refcards/cs-refcard.tex, refcards/cs-survival.tex:
+	* refcards/de-refcard.tex, refcards/dired-ref.tex:
+	* refcards/fr-dired-ref.tex, refcards/fr-refcard.tex:
+	* refcards/fr-survival.tex, refcards/orgcard.tex:
+	* refcards/pl-refcard.tex, refcards/pt-br-refcard.tex:
+	* refcards/refcard.tex, refcards/ru-refcard.tex:
+	* refcards/sk-dired-ref.tex, refcards/sk-refcard.tex:
+	* refcards/sk-survival.tex, refcards/survival.tex:
+	* 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.