Merge from emacs--rel--22

[gnu-emacs] / src / m / tad68k.h

diff --git a/src/m/tad68k.h b/src/m/tad68k.h
index 4aa142fbd91b03cda32c22b3dcf0ea6ae35f816d..5e982a314ab82db9ae8e8dcf6528a729a0e54165 100644 (file)
--- a/src/m/tad68k.h
+++ b/src/m/tad68k.h
@@ -1,11 +1,12 @@
 /* Machine-dependent configuration for GNU Emacs for Tadpole 68k machines
-   Copyright (C) 1986, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1986, 2001, 2002, 2003, 2004, 2005,
+                 2006, 2007  Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
 GNU Emacs is free software; you can redistribute it and/or modify
 it under the terms of the GNU General Public License as published by
-the Free Software Foundation; either version 2, or (at your option)
+the Free Software Foundation; either version 3, or (at your option)
 any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
@@ -15,8 +16,8 @@ GNU General Public License for more details.
 
 You should have received a copy of the GNU General Public License
 along with GNU Emacs; see the file COPYING.  If not, write to
-the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA.  */
+the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA.  */
 
 
 /* The following line tells the configuration script what sort of
@@ -109,3 +110,6 @@ Boston, MA 02111-1307, USA.  */
 #define HAVE_PTYS                      /* we do have PTYs if we have TCP */
 #define HAVE_SOCKETS                   /* we do have sockets if we have TCP */
 #define LIBS_SYSTEM -lsocket           /* get TCP networking functions */
+
+/* arch-tag: e0c09754-b0f2-48da-a8a5-aee3c94838f4
+   (do not change this comment) */