diff options
author | Miles Bader <miles@gnu.org> | 2007-07-26 05:19:58 +0000 |
---|---|---|
committer | Miles Bader <miles@gnu.org> | 2007-07-26 05:19:58 +0000 |
commit | 7d5989e14aacad4aa0775339dab645db80ab7144 (patch) | |
tree | 5ef65eee6f53936afaa7e2bbaa29828e388ddd3d | |
parent | 70360d0cab4f5e9fa351cd131e45fa86401896c0 (diff) | |
parent | ef2805c29bb03f0c8c0d4b37a65f511123dcab1c (diff) | |
download | emacs-7d5989e14aacad4aa0775339dab645db80ab7144.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.
2007-07-24 Glenn Morris <rgm@gnu.org>
* lisp/calendar/cal-tex.el (cal-tex-holidays, cal-tex-diary)
(cal-tex-rules, cal-tex-buffer, cal-tex-24)
(cal-tex-cursor-month-landscape, cal-tex-cursor-month)
(cal-tex-cursor-week, cal-tex-cursor-week2)
(cal-tex-cursor-week-iso, cal-tex-week-hours)
(cal-tex-cursor-week-monday, cal-tex-weekly4-box)
(cal-tex-cursor-filofax-2week, cal-tex-cursor-filofax-week)
(cal-tex-cursor-filofax-daily, cal-tex-daily-page): Doc fix.
Revision: emacs@sv.gnu.org/emacs--devo--0--patch-828
-rw-r--r-- | lisp/calendar/cal-tex.el | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/calendar/cal-tex.el b/lisp/calendar/cal-tex.el index 82c0d90dea7..1faa71efec9 100644 --- a/lisp/calendar/cal-tex.el +++ b/lisp/calendar/cal-tex.el @@ -13,7 +13,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, |