diff options
| author | Miles Bader <miles@gnu.org> | 2007-01-26 06:16:11 +0000 |
|---|---|---|
| committer | Miles Bader <miles@gnu.org> | 2007-01-26 06:16:11 +0000 |
| commit | c0466914ba3ad88c402b0301646b4b5db8aeb913 (patch) | |
| tree | 964d8df324ab5f46872dfedc92ccea9fe50a1441 /lisp/ChangeLog.6 | |
| parent | c97a3f22ed5841f1c8bcdbb80df2bd49635c6a56 (diff) | |
| parent | 58f8a3f97bd49484d0eb4f83a70662ded0daf9cc (diff) | |
| download | emacs-c0466914ba3ad88c402b0301646b4b5db8aeb913.tar.gz emacs-c0466914ba3ad88c402b0301646b4b5db8aeb913.tar.bz2 emacs-c0466914ba3ad88c402b0301646b4b5db8aeb913.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 586-614)
- Update from CVS
- Update from erc--emacs--22
- Merge from gnus--rel--5.10
- Merge from erc--main--0
- Make byte compiler correctly write circular constants
* gnus--rel--5.10 (patch 186-196)
- Update from CVS
- Merge from emacs--devo--0
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-162
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 dfa9dfae61b..0d02bf4739b 100644 --- a/lisp/ChangeLog.6 +++ b/lisp/ChangeLog.6 @@ -8021,7 +8021,7 @@ Wed Jul 26 15:40:00 Michael Kifer (kifer@cs.sunysb.edu) See ChangeLog.5 for earlier changes. - Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, 2005, 2006 + Copyright (C) 1995, 1996, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. Copying and distribution of this file, with or without modification, are permitted provided the copyright notice and this notice are preserved. |