Mercurial > emacs

diff lisp/ChangeLog.6 @ 112228:417b1e4d63cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from emacs-23
author Stefan Monnier <monnier@iro.umontreal.ca>
date Fri, 14 Jan 2011 12:18:41 -0500
parents e6408c088fbc 376148b31b5e
children ef719132ddfa
line wrap: on
line diff
--- a/lisp/ChangeLog.6	Fri Jan 14 16:06:17 2011 +0100
+++ b/lisp/ChangeLog.6	Fri Jan 14 12:18:41 2011 -0500
@@ -8023,7 +8023,7 @@
 ;; End:
 
     Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, 2005, 2006,
-      2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+      2007, 2008, 2009, 2010, 2011  Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.