Mercurial > emacs
comparison lispintro/cons-4.eps @ 83648:65663fcd2caa
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
author | Miles Bader <miles@gnu.org> |
---|---|
date | Tue, 31 Jul 2007 05:50:45 +0000 |
parents | ee787fc40e93 |
children | a8fd89a466fd |
comparison
equal
deleted
inserted
replaced
83647:3468e549a55b | 83648:65663fcd2caa |
---|---|
12 % | 12 % |
13 % This file is part of GNU Emacs. | 13 % This file is part of GNU Emacs. |
14 % | 14 % |
15 % GNU Emacs is free software; you can redistribute it and/or modify | 15 % GNU Emacs is free software; you can redistribute it and/or modify |
16 % it under the terms of the GNU General Public License as published by | 16 % it under the terms of the GNU General Public License as published by |
17 % the Free Software Foundation; either version 2, or (at your option) | 17 % the Free Software Foundation; either version 3, or (at your option) |
18 % any later version. | 18 % any later version. |
19 % | 19 % |
20 % GNU Emacs is distributed in the hope that it will be useful, | 20 % GNU Emacs is distributed in the hope that it will be useful, |
21 % but WITHOUT ANY WARRANTY; without even the implied warranty of | 21 % but WITHOUT ANY WARRANTY; without even the implied warranty of |
22 % MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the | 22 % MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the |