Merged from miles@gnu.org--gnu-2005 (patch 610-614)

Patches applied:

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

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

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

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

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

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

1 files changed, 1 insertions, 1 deletions

diff --git a/src/emacs.c b/src/emacs.c
index 9ada521f1e3..33941ae9227 100644
--- a/src/emacs.c
+++ b/src/emacs.c
@@ -897,7 +897,7 @@ main (argc, argv
       else
         {
           printf ("GNU Emacs %s\n", SDATA (tem));
-          printf ("Copyright (C) 2004 Free Software Foundation, Inc.\n");
+          printf ("Copyright (C) 2005 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");