diff options
| author | Miles Bader | 2006-02-08 04:26:44 +0000 |
|---|---|---|
| committer | Miles Bader | 2006-02-08 04:26:44 +0000 |
| commit | 380874900ca183ec2fdce91949d841328852d7a8 (patch) | |
| tree | 6918a4182f8657251e83223511aa7827fb8820ed /lib-src/ChangeLog | |
| parent | 72b464afc12a7532fc8555352db04c65647c15ae (diff) | |
| parent | c96ec15a58817ac97db5348187e2d8695f609cb5 (diff) | |
| download | emacs-380874900ca183ec2fdce91949d841328852d7a8.tar.gz emacs-380874900ca183ec2fdce91949d841328852d7a8.zip | |
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-13
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 43-57)
- Update from CVS
- Merge from erc--emacs--0
- Make constrain-to-field notice overlays
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 18-21)
- Update from CVS
- Merge from emacs--devo--0
Diffstat (limited to 'lib-src/ChangeLog')
| -rw-r--r-- | lib-src/ChangeLog | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog index c8d1cb41dea..df8639f31fa 100644 --- a/lib-src/ChangeLog +++ b/lib-src/ChangeLog | |||
| @@ -5788,8 +5788,8 @@ Tue Jul 1 01:09:07 1997 Geoff Voelker <voelker@cs.washington.edu> | |||
| 5788 | ;; End: | 5788 | ;; End: |
| 5789 | 5789 | ||
| 5790 | Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, | 5790 | Copyright (C) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, |
| 5791 | 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004 | 5791 | 1996, 1997, 1998, 1999, 2001, 2002, 2003, 2004, 2005, |
| 5792 | Free Software Foundation, Inc. | 5792 | 2006 Free Software Foundation, Inc. |
| 5793 | Copying and distribution of this file, with or without modification, | 5793 | Copying and distribution of this file, with or without modification, |
| 5794 | are permitted provided the copyright notice and this notice are preserved. | 5794 | are permitted provided the copyright notice and this notice are preserved. |
| 5795 | 5795 | ||