Mercurial > emacs
diff lisp/desktop.el @ 90201:fbb2bea03df9
Revision: miles@gnu.org--gnu-2005/emacs--unicode--0--patch-69
Merge from emacs--cvs-trunk--0
Patches applied:
* emacs--cvs-trunk--0 (patch 474-484)
- Update from CVS
- Merge from gnus--rel--5.10
* gnus--rel--5.10 (patch 88-91)
- Merge from emacs--cvs-trunk--0
- Update FSF's address in GPL notices
- Update from CVS
| author | Miles Bader <miles@gnu.org> |
|---|---|
| date | Thu, 14 Jul 2005 08:02:00 +0000 |
| parents | f9a65d7ebd29 f2bb50c9b2dd |
| children | 187d6a1f84f7 |
line wrap: on
line diff
--- a/lisp/desktop.el Thu Jul 07 12:43:14 2005 +0000 +++ b/lisp/desktop.el Thu Jul 14 08:02:00 2005 +0000 @@ -4,7 +4,7 @@ ;; Free Software Foundation, Inc. ;; Author: Morten Welinder <terra@diku.dk> -;; Maintainter: Lars Hansen <larsh@math.ku.dk> +;; Maintainter: Lars Hansen <larsh@soem.dk> ;; Keywords: convenience ;; Favourite-brand-of-beer: None, I hate beer.