comparison src/ChangeLog.4 @ 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
6908 6908
6909 This file is part of GNU Emacs. 6909 This file is part of GNU Emacs.
6910 6910
6911 GNU Emacs is free software; you can redistribute it and/or modify 6911 GNU Emacs is free software; you can redistribute it and/or modify
6912 it under the terms of the GNU General Public License as published by 6912 it under the terms of the GNU General Public License as published by
6913 the Free Software Foundation; either version 2, or (at your option) 6913 the Free Software Foundation; either version 3, or (at your option)
6914 any later version. 6914 any later version.
6915 6915
6916 GNU Emacs is distributed in the hope that it will be useful, 6916 GNU Emacs is distributed in the hope that it will be useful,
6917 but WITHOUT ANY WARRANTY; without even the implied warranty of 6917 but WITHOUT ANY WARRANTY; without even the implied warranty of
6918 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 6918 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the