Merge from emacs--rel--22

[gnu-emacs] / doc / emacs / emerge-xtra.texi

diff --git a/doc/emacs/emerge-xtra.texi b/doc/emacs/emerge-xtra.texi
index e78f17e59d6fdadee3cab51ccd32f1102cec1b2b..a2141ec02e1f66315125102d7cb4825d5948dee1 100644 (file)
--- a/doc/emacs/emerge-xtra.texi
+++ b/doc/emacs/emerge-xtra.texi
@@ -1,5 +1,5 @@
 @c This is part of the Emacs manual.
-@c Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc.
+@c Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc.
 @c See file emacs.texi for copying conditions.
 @c
 @c This file is included either in emacs-xtra.texi (when producing the