Merge from emacs--devo--0

[gnu-emacs] / admin / alloc-colors.c

diff --git a/admin/alloc-colors.c b/admin/alloc-colors.c
index 4be2038ef1ca210878481e03b3741244008349a6..22447643e5e8399d785d251fe42665aa7a151333 100644 (file)
--- a/admin/alloc-colors.c
+++ b/admin/alloc-colors.c
@@ -1,11 +1,12 @@
 /* Allocate X colors.  Used for testing with dense colormaps.
-   Copyright (C) 2001 Free Software Foundation, Inc.
+   Copyright (C) 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.  */
 
 #include <X11/Xlib.h>
 #include <stdio.h>
@@ -111,3 +112,6 @@ main (int argc, char **argv)
   XCloseDisplay (dpy);
   return 0;
 }
+
+/* arch-tag: f1be90ac-5b70-43c2-835e-5a6432a25145
+   (do not change this comment) */