diff options
author | Miles Bader <miles@gnu.org> | 2007-07-26 05:28:10 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2007-07-26 05:28:10 +0000 |
commit | 717493cf85a743670e3633714bc206ddc38be5c6 (patch) | |
tree | 3768adb2c0584b93467ce4c7bba42c814ab2e3fa /lisp/custom.el | |
parent | 21f7a22af1336e42e79748c654fd9e91402f152e (diff) | |
parent | 2578c58247e65513270a601ec6cf55f554013b1c (diff) | |
download | emacs-717493cf85a743670e3633714bc206ddc38be5c6.tar.gz |
Merge from emacs--rel--22
Patches applied:
* emacs--rel--22 (patch 70-73)
- Update from CVS
2007-07-25 Glenn Morris <rgm@gnu.org>
* Relicense all FSF files to GPLv3 or later.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-828
Diffstat (limited to 'lisp/custom.el')
-rw-r--r-- | lisp/custom.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/custom.el b/lisp/custom.el index 98a301d80f1..a5a455c2f32 100644 --- a/lisp/custom.el +++ b/lisp/custom.el @@ -11,7 +11,7 @@ ;; 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, |