diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-14 10:14:17 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-01-14 10:14:17 -0800 |
| commit | 8a1f4a98c1b8e3abaf1b46394a88d09531ce4c2d (patch) | |
| tree | 9aed5489fdfdcf75087bf3d8e50e4f5952c8566c /lisp/ChangeLog.2 | |
| parent | 3720fa2b1ac94b8ac9f193264bcf36990a5f43d2 (diff) | |
| parent | f80aa5bfa90dff5cd75d1f40e4ababa3c86af7fb (diff) | |
| download | emacs-8a1f4a98c1b8e3abaf1b46394a88d09531ce4c2d.tar.gz | |
Merge from mainline.
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. |