diff doc/man/ChangeLog @ 110931:2316b868d5be

Merge changes from emacs-23 branch.
author Juanma Barranquero <lekktu@gmail.com>
date Tue, 12 Oct 2010 01:57:49 +0200
parents 0b20044988e1 a28c57bb896c
children 40af77a50adc
line wrap: on
line diff
--- a/doc/man/ChangeLog	Mon Oct 11 23:29:33 2010 +0000
+++ b/doc/man/ChangeLog	Tue Oct 12 01:57:49 2010 +0200
@@ -1,3 +1,11 @@
+2010-10-12  Glenn Morris  <rgm@gnu.org>
+
+	* emacs.1: Small fixes.
+
+2010-10-12  Ulrich Mueller  <ulm@gentoo.org>
+
+	* emacs.1: Update license description.
+
 2010-10-09  Glenn Morris  <rgm@gnu.org>
 
 	* b2m.1: Remove file.