Merge from emacs-24; up to 2012-12-06T01:39:03Z!monnier@iro.umontreal.ca

[gnu-emacs] / lisp / desktop.el

diff --git a/lisp/desktop.el b/lisp/desktop.el
index 5589dd025bc60635b86a1fed91ecc2efcd90833e..1151bd434bc9a3fb53def09e91a2e13a6ae1f9d3 100644 (file)
--- 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