Merge from emacs--devo--0

[gnu-emacs] / lisp / desktop.el

diff --git a/lisp/desktop.el b/lisp/desktop.el
index 3030bf5ecd146791fb242f86aa14bc9687a58ed2..12cd378f0f41194e98027c2eec92503ba90bb462 100644 (file)
--- a/lisp/desktop.el
+++ b/lisp/desktop.el
@@ -1,7 +1,7 @@
 ;;; desktop.el --- save partial status of Emacs when killed
 
 ;; Copyright (C) 1993, 1994, 1995, 1997, 2000, 2001, 2002, 2003,
-;;   2004, 2005, 2006 Free Software Foundation, Inc.
+;;   2004, 2005, 2006, 2007 Free Software Foundation, Inc.
 
 ;; Author: Morten Welinder <terra@diku.dk>
 ;; Maintainter: Lars Hansen <larsh@soem.dk>