Merge changes from CUPS 1.4svn-r7715.

[thirdparty/cups.git] / filter / testimage.c

diff --git a/filter/testimage.c b/filter/testimage.c
index f1a44b7e57f95f052e5f9b8558a54c378892de21..0c57279712969ba44f83c24eaa3e4d7582a81c5d 100644 (file)
--- a/filter/testimage.c
+++ b/filter/testimage.c
@@ -1,25 +1,16 @@
 /*
- * "$Id: testimage.c 177 2006-06-21 00:20:03Z jlovell $"
+ * "$Id$"
  *
  *   Image library test program for the Common UNIX Printing System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1993-2006 by Easy Software Products.
  *
  *   These coded instructions, statements, and computer programs are the
- *   property of Easy Software Products and are protected by Federal
- *   copyright law.  Distribution and use rights are outlined in the file
- *   "LICENSE.txt" which should have been included with this file.  If this
- *   file is missing or damaged please contact Easy Software Products
- *   at:
- *
- *       Attn: CUPS Licensing Information
- *       Easy Software Products
- *       44141 Airport View Drive, Suite 204
- *       Hollywood, Maryland 20636 USA
- *
- *       Voice: (301) 373-9600
- *       EMail: cups-info@cups.org
- *         WWW: http://www.cups.org
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
+ *   which should have been included with this file.  If this file is
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  *
  *   This file is subject to the Apple OS-Developed Software exception.
  *
@@ -104,5 +95,5 @@ main(int  argc,                              /* I - Number of command-line arguments */
 
 
 /*
- * End of "$Id: testimage.c 177 2006-06-21 00:20:03Z jlovell $".
+ * End of "$Id$".
  */