Merge from emacs--rel--22

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

diff --git a/doc/emacs/xresources.texi b/doc/emacs/xresources.texi
index c402ec89f8807602c841c675273b09be376fc4a1..9173de21a549f4e0792ff830ba8c50389015339a 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 Free Software Foundation, Inc.
+@c   2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @node X Resources, Antinews, Emacs Invocation, Top
 @appendix X Options and Resources