Merge changes from emacs-23 branch

[gnu-emacs] / src / s / usg5-4-common.h

diff --git a/src/s/usg5-4-common.h b/src/s/usg5-4-common.h
index 4dcb8e50200df6ad111deff3d685e635d0bbf2e9..12f73c1b3b548bd81596f73c29f45f5e12538a09 100644 (file)
--- a/src/s/usg5-4-common.h
+++ b/src/s/usg5-4-common.h
@@ -1,7 +1,6 @@
 /* Definitions file for GNU Emacs running on AT&T's System V Release 4
 
-Copyright (C) 1987, 1990, 1999, 2000, 2001, 2002, 2003, 2004, 2005,
-  2006, 2007, 2008, 2009, 2010  Free Software Foundation, Inc.
+Copyright (C) 1987, 1990, 1999-2011  Free Software Foundation, Inc.
 
 Written by James Van Artsdalen of Dell Computer Corp. james@bigtex.cactus.org.
 Subsequently improved for Dell 2.2 by Eric S. Raymond <esr@snark.thyrsus.com>.
@@ -107,5 +106,3 @@ along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
 /* This definition was suggested for next release.  So give it a try.  */
 #define HAVE_SOCKETS
 
-/* arch-tag: 1a0ed909-5faa-434b-b7c3-9d86c63d53a6
-   (do not change this comment) */