diff options
| author | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-01-14 12:18:41 -0500 |
|---|---|---|
| committer | Stefan Monnier <monnier@iro.umontreal.ca> | 2011-01-14 12:18:41 -0500 |
| commit | 77ab81d0545e980c57c0a35510ade29a9e43b4cd (patch) | |
| tree | 258514dac7faab41642d8f319eb113c8a5f09690 /lisp/ChangeLog.6 | |
| parent | 8faba62c38f67693535c3471d867e66757b3b04e (diff) | |
| parent | fb724e553757e9d3344be443ab5f329afc9bf91c (diff) | |
| download | emacs-77ab81d0545e980c57c0a35510ade29a9e43b4cd.tar.gz | |
Merge from emacs-23
Diffstat (limited to 'lisp/ChangeLog.6')
| -rw-r--r-- | lisp/ChangeLog.6 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/ChangeLog.6 b/lisp/ChangeLog.6 index e5bd7fa9d27..3626be96a1a 100644 --- a/lisp/ChangeLog.6 +++ b/lisp/ChangeLog.6 @@ -8023,7 +8023,7 @@ See ChangeLog.5 for earlier changes. ;; 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. |