diff options
| author | Stefan Monnier | 2011-01-14 12:18:41 -0500 |
|---|---|---|
| committer | Stefan Monnier | 2011-01-14 12:18:41 -0500 |
| commit | 77ab81d0545e980c57c0a35510ade29a9e43b4cd (patch) | |
| tree | 258514dac7faab41642d8f319eb113c8a5f09690 /src/ChangeLog.2 | |
| parent | 8faba62c38f67693535c3471d867e66757b3b04e (diff) | |
| parent | fb724e553757e9d3344be443ab5f329afc9bf91c (diff) | |
| download | emacs-77ab81d0545e980c57c0a35510ade29a9e43b4cd.tar.gz emacs-77ab81d0545e980c57c0a35510ade29a9e43b4cd.zip | |
Merge from emacs-23
Diffstat (limited to 'src/ChangeLog.2')
| -rw-r--r-- | src/ChangeLog.2 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ChangeLog.2 b/src/ChangeLog.2 index 0397478f09d..ace0a064a81 100644 --- a/src/ChangeLog.2 +++ b/src/ChangeLog.2 | |||
| @@ -4772,7 +4772,7 @@ | |||
| 4772 | See ChangeLog.1 for earlier changes. | 4772 | See ChangeLog.1 for earlier changes. |
| 4773 | 4773 | ||
| 4774 | Copyright (C) 1986, 1987, 1988, 2001, 2002, 2003, 2004, 2005, 2006, | 4774 | Copyright (C) 1986, 1987, 1988, 2001, 2002, 2003, 2004, 2005, 2006, |
| 4775 | 2007, 2008, 2009, 2010 Free Software Foundation, Inc. | 4775 | 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. |
| 4776 | 4776 | ||
| 4777 | This file is part of GNU Emacs. | 4777 | This file is part of GNU Emacs. |
| 4778 | 4778 | ||