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.3 | |
| parent | 8faba62c38f67693535c3471d867e66757b3b04e (diff) | |
| parent | fb724e553757e9d3344be443ab5f329afc9bf91c (diff) | |
| download | emacs-77ab81d0545e980c57c0a35510ade29a9e43b4cd.tar.gz emacs-77ab81d0545e980c57c0a35510ade29a9e43b4cd.zip | |
Merge from emacs-23
Diffstat (limited to 'src/ChangeLog.3')
| -rw-r--r-- | src/ChangeLog.3 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ChangeLog.3 b/src/ChangeLog.3 index e3ba2b37ccd..cf336ca3eab 100644 --- a/src/ChangeLog.3 +++ b/src/ChangeLog.3 | |||
| @@ -16507,7 +16507,7 @@ See ChangeLog.2 for earlier changes. | |||
| 16507 | ;; coding: utf-8 | 16507 | ;; coding: utf-8 |
| 16508 | ;; End: | 16508 | ;; End: |
| 16509 | 16509 | ||
| 16510 | Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 | 16510 | Copyright (C) 1993, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 |
| 16511 | Free Software Foundation, Inc. | 16511 | Free Software Foundation, Inc. |
| 16512 | 16512 | ||
| 16513 | This file is part of GNU Emacs. | 16513 | This file is part of GNU Emacs. |