Merged from miles@gnu.org--gnu-2005 (patch 683-684)

Patches applied:

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-683
   Update from CVS

 * miles@gnu.org--gnu-2005/emacs--cvs-trunk--0--patch-684
   Update from CVS

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

1 files changed, 2 insertions, 2 deletions

diff --git a/src/emacs.c b/src/emacs.c
index d38cf4379bf..e9fb4e3cb85 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -1,6 +1,6 @@
 /* Fully extensible Emacs, running on Unix, intended for GNU.
    Copyright (C) 1985, 1986, 1987, 1993, 1994, 1995, 1997, 1998, 1999,
-                 2001, 2002, 2003, 2004, 2005 Free Software Foundation, Inc.
+                 2001, 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -900,7 +900,7 @@ main (argc, argv
       else
         {
           printf ("GNU Emacs %s\n", SDATA (tem));
-          printf ("Copyright (C) 2005 Free Software Foundation, Inc.\n");
+          printf ("Copyright (C) 2006 Free Software Foundation, Inc.\n");
           printf ("GNU Emacs comes with ABSOLUTELY NO WARRANTY.\n");
           printf ("You may redistribute copies of Emacs\n");
           printf ("under the terms of the GNU General Public License.\n");