diff options
| author | Miles Bader | 2007-07-31 05:50:45 +0000 |
|---|---|---|
| committer | Miles Bader | 2007-07-31 05:50:45 +0000 |
| commit | 9899d01a0ccec166e04caa60657a44e614be50cd (patch) | |
| tree | 6f7874938065fd9808765059213ff7a94ab3268b /src/ChangeLog.5 | |
| parent | 96157d113ae5828cc280488211610db1960d572c (diff) | |
| parent | 2f12b713116a4e15b4744fc78d5f0dbb57fcd1ca (diff) | |
| download | emacs-9899d01a0ccec166e04caa60657a44e614be50cd.tar.gz emacs-9899d01a0ccec166e04caa60657a44e614be50cd.zip | |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 824-838)
- Update from CVS
- Merge from emacs--rel--22
- Remove lisp/erc/erc-nicklist.el
- Update some .arch-inventory files
- Fix void function definition error in cus-edit.el
- Restore lisp/emacs-lisp/cl-loaddefs.el
* emacs--rel--22 (patch 70-83)
- Update from CVS
- Remove lisp/erc/erc-nicklist.el
- Update some .arch-inventory files
- Indicate that emacs--devo--0--patch-834 does not need to be applied
- Merge from gnus--rel--5.10
- Restore lisp/emacs-lisp/cl-loaddefs.el
* gnus--rel--5.10 (patch 239-241)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--multi-tty--0--patch-28
Diffstat (limited to 'src/ChangeLog.5')
| -rw-r--r-- | src/ChangeLog.5 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ChangeLog.5 b/src/ChangeLog.5 index 975bd646285..b555020d625 100644 --- a/src/ChangeLog.5 +++ b/src/ChangeLog.5 | |||
| @@ -7151,7 +7151,7 @@ See ChangeLog.4 for earlier changes. | |||
| 7151 | 7151 | ||
| 7152 | GNU Emacs is free software; you can redistribute it and/or modify | 7152 | GNU Emacs is free software; you can redistribute it and/or modify |
| 7153 | it under the terms of the GNU General Public License as published by | 7153 | it under the terms of the GNU General Public License as published by |
| 7154 | the Free Software Foundation; either version 2, or (at your option) | 7154 | the Free Software Foundation; either version 3, or (at your option) |
| 7155 | any later version. | 7155 | any later version. |
| 7156 | 7156 | ||
| 7157 | GNU Emacs is distributed in the hope that it will be useful, | 7157 | GNU Emacs is distributed in the hope that it will be useful, |