summaryrefslogtreecommitdiff
path: root/lisp/frame.el
diff options
context:
space:
mode:
authorStefan Monnier <monnier@iro.umontreal.ca>2011-01-14 12:18:41 -0500
committerStefan Monnier <monnier@iro.umontreal.ca>2011-01-14 12:18:41 -0500
commit77ab81d0545e980c57c0a35510ade29a9e43b4cd (patch)
tree258514dac7faab41642d8f319eb113c8a5f09690 /lisp/frame.el
parent8faba62c38f67693535c3471d867e66757b3b04e (diff)
parentfb724e553757e9d3344be443ab5f329afc9bf91c (diff)
downloademacs-77ab81d0545e980c57c0a35510ade29a9e43b4cd.tar.gz
Merge from emacs-23
Diffstat (limited to 'lisp/frame.el')
-rw-r--r--lisp/frame.el3
1 files changed, 1 insertions, 2 deletions
diff --git a/lisp/frame.el b/lisp/frame.el
index 969a02debe9..7b063beba4e 100644
--- a/lisp/frame.el
+++ b/lisp/frame.el
@@ -1,8 +1,7 @@
;;; frame.el --- multi-frame management independent of window systems
;; Copyright (C) 1993, 1994, 1996, 1997, 2000, 2001, 2002, 2003,
-;; 2004, 2005, 2006, 2007, 2008, 2009, 2010
-;; Free Software Foundation, Inc.
+;; 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
;; Maintainer: FSF
;; Keywords: internal