comparison src/ChangeLog.5 @ 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 922696f363b0
children fc2bcd2a8aad f55f9811f5d7
comparison
equal deleted inserted replaced
83647:3468e549a55b 83648:65663fcd2caa
7149 7149
7150 This file is part of GNU Emacs. 7150 This file is part of GNU Emacs.
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,
7158 but WITHOUT ANY WARRANTY; without even the implied warranty of 7158 but WITHOUT ANY WARRANTY; without even the implied warranty of
7159 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 7159 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the