diff doc/man/ChangeLog @ 108375:973b5bc5fcfe

Merge from emacs-23
author Stefan Monnier <monnier@iro.umontreal.ca>
date Sat, 08 May 2010 14:47:07 -0400
parents b4d27afff1bf bfc8980754ed
children 0dcf6ddbe02b
line wrap: on
line diff
--- a/doc/man/ChangeLog	Sat May 08 11:42:56 2010 -0700
+++ b/doc/man/ChangeLog	Sat May 08 14:47:07 2010 -0400
@@ -1,11 +1,15 @@
+2010-05-07  Chong Yidong  <cyd@stupidchicken.com>
+
+	* Version 23.2 released.
+
 2010-03-10  Chong Yidong  <cyd@stupidchicken.com>
 
 	* Branch for 23.2.
 
 2010-01-09  Chong Yidong  <cyd@stupidchicken.com>
 
-	* emacs.1: Copyedits.  Update options -Q, -mm and --daemon.  Remove
-	deprecated --unibyte option.
+	* emacs.1: Copyedits.  Update options -Q, -mm and --daemon.
+	Remove deprecated --unibyte option.
 
 2009-06-21  Chong Yidong  <cyd@stupidchicken.com>