Merge changes from CUPS 1.5svn-r8950.

[thirdparty/cups.git] / filter / form-tree.c

diff --git a/filter/form-tree.c b/filter/form-tree.c
index 188a254b1359112e353e1980a7bca5294b972624..337924d09a23bbc0ff3906f99d9a706192810af5 100644 (file)
--- a/filter/form-tree.c
+++ b/filter/form-tree.c
@@ -1,26 +1,17 @@
 /*
- * "$Id: form-tree.c 4494 2005-02-18 02:18:11Z mike $"
+ * "$Id: form-tree.c 6649 2007-07-11 21:46:42Z mike $"
  *
  *   CUPS form document tree routines for the Common UNIX Printing
  *   System (CUPS).
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2005 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.
  *
@@ -620,5 +611,5 @@ parse_element(tree_t *t,            /* I - Current tree node */
 
 
 /*
- * End of "$Id: form-tree.c 4494 2005-02-18 02:18:11Z mike $".
+ * End of "$Id: form-tree.c 6649 2007-07-11 21:46:42Z mike $".
  */