Merge from emacs-23

[gnu-emacs] / doc / emacs / frames.texi

diff --git a/doc/emacs/frames.texi b/doc/emacs/frames.texi
index 0ecf6f68d8c6fc352aa00bc1db6d354409121ddc..dadba9fb95f45752a3f762297adb3b5e9ae1d130 100644 (file)
--- a/doc/emacs/frames.texi
+++ b/doc/emacs/frames.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
 @c Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1999, 2000,
-@c   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
+@c   2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011
 @c   Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node Frames, International, Windows, Top