Merge from emacs-23

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

diff --git a/doc/emacs/xresources.texi b/doc/emacs/xresources.texi
index ecf5c02f32b1fba6e3604d71b5041edb30cbb0d3..89ec08d820d140aa2ea131b4e437ca9ca7dd2941 100644 (file)
--- a/doc/emacs/xresources.texi
+++ b/doc/emacs/xresources.texi
@@ -1,6 +1,6 @@
 @c This is part of the Emacs manual.
 @c Copyright (C) 1987, 1993, 1994, 1995, 1997, 2001, 2002, 2003,
-@c   2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software Foundation, Inc.
+@c   2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node X Resources, Antinews, Emacs Invocation, Top
 @appendix X Options and Resources