diff options
author | Miles Bader <miles@gnu.org> | 2007-07-15 04:47:46 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2007-07-15 04:47:46 +0000 |
commit | 8c406a9bc42ee77fcbbb4201fe8bda855eafd832 (patch) | |
tree | 14c8fa2e72341edd9db40b17079fd5208b1554c8 /lisp/emacs-lisp/copyright.el | |
parent | 9bdeb5e9bedd773cc6845bc29a98e1e2a208f1ff (diff) | |
parent | 6f8a87c027ebd6f9cfdac5c0df97d651227bec62 (diff) | |
download | emacs-8c406a9bc42ee77fcbbb4201fe8bda855eafd832.tar.gz emacs-8c406a9bc42ee77fcbbb4201fe8bda855eafd832.tar.bz2 emacs-8c406a9bc42ee77fcbbb4201fe8bda855eafd832.zip |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 806-813)
- Merge from emacs--rel--22
- Update from CVS
* emacs--rel--22 (patch 51-58)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 233-236)
- Merge from emacs--devo--0
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-230
Diffstat (limited to 'lisp/emacs-lisp/copyright.el')
-rw-r--r-- | lisp/emacs-lisp/copyright.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/emacs-lisp/copyright.el b/lisp/emacs-lisp/copyright.el index d4501bd57b0..41a3144f91a 100644 --- a/lisp/emacs-lisp/copyright.el +++ b/lisp/emacs-lisp/copyright.el @@ -77,7 +77,7 @@ When this is `function', only ask when called non-interactively." ;; when modifying this, also modify the comment generated by autoinsert.el -(defconst copyright-current-gpl-version "2" +(defconst copyright-current-gpl-version "3" "String representing the current version of the GPL or nil.") (defvar copyright-update t) |