diff options
author | Miles Bader <miles@gnu.org> | 2007-07-31 05:50:45 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2007-07-31 05:50:45 +0000 |
commit | 79922c9543ae1c375cd91eefcec309671187d790 (patch) | |
tree | 06b672c50b41092257f66c6d123a5449709537a1 /src/emacs.c | |
parent | b50493ea16ae2cde75dc9c5f2693234d620094c3 (diff) | |
parent | 086559489167cae349f06a1133fbcc758e6e6cda (diff) | |
download | emacs-79922c9543ae1c375cd91eefcec309671187d790.tar.gz |
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/emacs.c')
-rw-r--r-- | src/emacs.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/emacs.c b/src/emacs.c index 079f13b2d4f..373eab33e11 100644 --- a/src/emacs.c +++ b/src/emacs.c @@ -6,7 +6,7 @@ This file is part of GNU Emacs. GNU Emacs is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by -the Free Software Foundation; either version 2, or (at your option) +the Free Software Foundation; either version 3, or (at your option) any later version. GNU Emacs is distributed in the hope that it will be useful, |