diff doc/misc/ChangeLog @ 106981:e3fcbe16deae

merge conflict
author Mark A. Hershberger <mhershberger@intrahealth.org>
date Sun, 24 Jan 2010 23:52:26 -0500
parents 66e0d01014c6 3397f54d8969
children 978bba88d79c
line wrap: on
line diff
--- a/doc/misc/ChangeLog	Tue Jan 19 14:39:22 2010 -0500
+++ b/doc/misc/ChangeLog	Sun Jan 24 23:52:26 2010 -0500
@@ -1,4 +1,8 @@
-2010-01-19  Mark A. Hershberger  <mah@everybody.org>
+2010-01-24  Mark A. Hershberger  <mah@everybody.org>
+
+	* gnus.texi (Score File Format): Fix typo.
+
+2010-01-21  Katsumi Yamaoka  <yamaoka@jpl.org>
 
 	* cc-mode.texi: Replace references to obsolete c-subword-mode.