diff options
| author | Tom Tromey <tromey@redhat.com> | 2013-01-05 19:36:45 -0700 |
|---|---|---|
| committer | Tom Tromey <tromey@redhat.com> | 2013-01-05 19:36:45 -0700 |
| commit | e078a23febca14bc919c5806670479c395e3253e (patch) | |
| tree | e9e4ed91feef744d525264c31974c3ed00146bcd /lisp/desktop.el | |
| parent | 63d535c829a930207b64fe733228f15a554644b1 (diff) | |
| parent | 7a2657fa3bedbd977f4e11fe030cb4a210c04ab4 (diff) | |
| download | emacs-e078a23febca14bc919c5806670479c395e3253e.tar.gz | |
merge from trunk
Diffstat (limited to 'lisp/desktop.el')
| -rw-r--r-- | lisp/desktop.el | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lisp/desktop.el b/lisp/desktop.el index 5589dd025bc..1151bd434bc 100644 --- a/lisp/desktop.el +++ b/lisp/desktop.el @@ -1,6 +1,7 @@ ;;; desktop.el --- save partial status of Emacs when killed -;; Copyright (C) 1993-1995, 1997, 2000-2012 Free Software Foundation, Inc. +;; Copyright (C) 1993-1995, 1997, 2000-2013 Free Software Foundation, +;; Inc. ;; Author: Morten Welinder <terra@diku.dk> ;; Keywords: convenience |