Merge from emacs--devo--0

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

diff --git a/admin/alloc-colors.c b/admin/alloc-colors.c
index 3ca8d4349f35c15336adaa78f66677897da1df29..22447643e5e8399d785d251fe42665aa7a151333 100644 (file)
--- a/admin/alloc-colors.c
+++ b/admin/alloc-colors.c
@@ -1,12 +1,12 @@
 /* Allocate X colors.  Used for testing with dense colormaps.
-   Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006  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,