Add 2011 to FSF/AIST copyright years.

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

diff --git a/admin/alloc-colors.c b/admin/alloc-colors.c
index 4be2038ef1ca210878481e03b3741244008349a6..38312604248ab095eff82ab079e5d646252a1123 100644 (file)
--- a/admin/alloc-colors.c
+++ b/admin/alloc-colors.c
@@ -1,12 +1,13 @@
 /* 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, 2008, 2009, 2010, 2011
+     Free Software Foundation, Inc.
 
 This file is part of GNU Emacs.
 
-GNU Emacs is free software; you can redistribute it and/or modify
+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)
-any later version.
+the Free Software Foundation, either version 3 of the License, or
+(at your option) any later version.
 
 GNU Emacs is distributed in the hope that it will be useful,
 but WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -14,9 +15,8 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 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.  */
+along with GNU Emacs.  If not, see <http://www.gnu.org/licenses/>.  */
+
 
 #include <X11/Xlib.h>
 #include <stdio.h>
@@ -111,3 +111,6 @@ main (int argc, char **argv)
   XCloseDisplay (dpy);
   return 0;
 }
+
+/* arch-tag: f1be90ac-5b70-43c2-835e-5a6432a25145
+   (do not change this comment) */