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 | 066f76b1166fd132b770b7c092f68609fa2599e8 (patch) | |
tree | f4871e9bd949a8cc44bcad5797ceb909dce94364 /lisp/ChangeLog.2 | |
parent | 04c1a1e361cc8bb84304a10835156e7d6739c60a (diff) | |
parent | 74c3ca4e1fbc22b7f31d7cd84972962a757526bc (diff) | |
download | emacs-066f76b1166fd132b770b7c092f68609fa2599e8.tar.gz |
Merge from emacs-23
Diffstat (limited to 'lisp/ChangeLog.2')
-rw-r--r-- | lisp/ChangeLog.2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/ChangeLog.2 b/lisp/ChangeLog.2 index 90c00dc6360..57ae07d0f10 100644 --- a/lisp/ChangeLog.2 +++ b/lisp/ChangeLog.2 @@ -3993,7 +3993,7 @@ See ChangeLog.1 for earlier changes. Copyright (C) 1986, 1987, 1988, 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. |