diff options
author | Miles Bader <miles@gnu.org> | 2007-07-27 10:52:18 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2007-07-27 10:52:18 +0000 |
commit | e468b87f91f26e66a8cde087c1a9c89c67b96d12 (patch) | |
tree | 7cf1ded30152bb0ddd4bbff544693a05b3b62911 /lisp/language/misc-lang.el | |
parent | b692c96bfa9b8bedd6e093a6c571624442db2e2a (diff) | |
parent | 05bfa8f34f3eedec3ad2fdb45971476a8c8f49b1 (diff) | |
download | emacs-e468b87f91f26e66a8cde087c1a9c89c67b96d12.tar.gz |
Merge from emacs--devo--0
Patches applied:
* emacs--devo--0 (patch 824-831)
- Update from CVS
- Merge from emacs--rel--22
* emacs--rel--22 (patch 70-74)
- Update from CVS
Revision: emacs@sv.gnu.org/emacs--unicode--0--patch-238
Diffstat (limited to 'lisp/language/misc-lang.el')
-rw-r--r-- | lisp/language/misc-lang.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/language/misc-lang.el b/lisp/language/misc-lang.el index 166a0a5d2a5..ab2c0bd2a7c 100644 --- a/lisp/language/misc-lang.el +++ b/lisp/language/misc-lang.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, |