summaryrefslogtreecommitdiff
path: root/lisp/disp-table.el
diff options
context:
space:
mode:
authorMiles Bader <miles@gnu.org>2007-07-26 05:28:10 +0000
committerMiles Bader <miles@gnu.org>2007-07-26 05:28:10 +0000
commit9aecacd08a93bffb529cee59d74477890ce96f37 (patch)
tree149d4cef4deb6e93e300b6ef89322181a3d29ce4 /lisp/disp-table.el
parent9ee365d565205366d61d9b50dd2a15ef903be983 (diff)
parentef2805c29bb03f0c8c0d4b37a65f511123dcab1c (diff)
downloademacs-9aecacd08a93bffb529cee59d74477890ce96f37.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/disp-table.el')
-rw-r--r--lisp/disp-table.el2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/disp-table.el b/lisp/disp-table.el
index 207063cbba2..4bf52896cf0 100644
--- a/lisp/disp-table.el
+++ b/lisp/disp-table.el
@@ -12,7 +12,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,