Merge from emacs--devo--0

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

diff --git a/src/m/acorn.h b/src/m/acorn.h
index 38b148b3d2ef6370c592507771ceea30e385b867..326fb7760aed241613a39d077e9bb6fb03cf8ea9 100644 (file)
--- a/src/m/acorn.h
+++ b/src/m/acorn.h
@@ -1,5 +1,6 @@
 /* Machine description file for Acorn RISCiX machines.
-   Copyright (C) 1994, 2002 Free Software Foundation, Inc.
+   Copyright (C) 1994, 2002, 2003, 2004, 2005,
+                 2006 Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
@@ -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.  */
 
 
 
@@ -179,3 +180,6 @@ do
 this
 yet
 #endif
+
+/* arch-tag: acee2955-8c49-4b40-813c-579f76f4c0c3
+   (do not change this comment) */