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 /mac/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 'mac/ChangeLog')
| -rw-r--r-- | mac/ChangeLog | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/mac/ChangeLog b/mac/ChangeLog index 5f538eb09e0..eb58386a167 100644 --- a/mac/ChangeLog +++ b/mac/ChangeLog | |||
| @@ -805,7 +805,8 @@ | |||
| 805 | ;; coding: iso-2022-7bit-unix | 805 | ;; coding: iso-2022-7bit-unix |
| 806 | ;; End: | 806 | ;; End: |
| 807 | 807 | ||
| 808 | Copyright (C) 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc. | 808 | Copyright (C) 2001, 2002, 2003, 2004, 2005, |
| 809 | 2006 Free Software Foundation, Inc. | ||
| 809 | Copying and distribution of this file, with or without modification, | 810 | Copying and distribution of this file, with or without modification, |
| 810 | are permitted provided the copyright notice and this notice are preserved. | 811 | are permitted provided the copyright notice and this notice are preserved. |
| 811 | 812 | ||