Merged from emacs@sv.gnu.org

Patches applied:

 * emacs@sv.gnu.org/emacs--devo--0--patch-41
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-42
   Merge from gnus--rel--5.10

 * emacs@sv.gnu.org/emacs--devo--0--patch-43
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-44
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-45
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-46
   Merge from erc--emacs--0

 * emacs@sv.gnu.org/emacs--devo--0--patch-47
   Update from CVS

 * emacs@sv.gnu.org/emacs--devo--0--patch-48
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-14
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-15
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-16
   Update from CVS

 * emacs@sv.gnu.org/gnus--rel--5.10--patch-17
   Merge from emacs--devo--0

git-archimport-id: lorentey@elte.hu--2004/emacs--multi-tty--0--patch-507

1 files changed, 2 insertions, 1 deletions

diff --git a/oldXMenu/SetPane.c b/oldXMenu/SetPane.c
index 907dba3b233..e76b75902c3 100644
--- a/oldXMenu/SetPane.c
+++ b/oldXMenu/SetPane.c
@@ -1,7 +1,8 @@
 #include "copyright.h"
 
 /* Copyright    Massachusetts Institute of Technology    1985   */
-/* Copyright (C) 2002, 2003, 2004, 2005 Free Software Foundation, Inc.  */
+/* Copyright (C) 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.  */
 
 /*
  * XMenu:       MIT Project Athena, X Window system menu package