comparison lib-src/rcs2log @ 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 1f2482de3237
children 4cf8770f7a75 f55f9811f5d7
comparison
equal deleted inserted replaced
83647:3468e549a55b 83648:65663fcd2caa
57 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003, 57 # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 2001, 2002, 2003,
58 # 2004, 2005, 2006, 2007 Free Software Foundation, Inc. 58 # 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
59 59
60 # This program is free software; you can redistribute it and/or modify 60 # This program is free software; you can redistribute it and/or modify
61 # it under the terms of the GNU General Public License as published by 61 # it under the terms of the GNU General Public License as published by
62 # the Free Software Foundation; either version 2, or (at your option) 62 # the Free Software Foundation; either version 3, or (at your option)
63 # any later version. 63 # any later version.
64 # 64 #
65 # This program is distributed in the hope that it will be useful, 65 # This program is distributed in the hope that it will be useful,
66 # but WITHOUT ANY WARRANTY; without even the implied warranty of 66 # but WITHOUT ANY WARRANTY; without even the implied warranty of
67 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 67 # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the