Merge changes from CUPS 1.4svn-r7874.

[thirdparty/cups.git] / scheduler / network.h

diff --git a/scheduler/network.h b/scheduler/network.h
index 5d8c83f8a4b3a97054400d074e1c88b74924daa7..dd38e211481fa2ae14eea13c46e372aa468979ec 100644 (file)
--- a/scheduler/network.h
+++ b/scheduler/network.h
@@ -1,26 +1,17 @@
 /*
- * "$Id: network.h 6090 2006-11-14 16:35:27Z mike $"
+ * "$Id: network.h 6649 2007-07-11 21:46:42Z mike $"
  *
  *   Network interface definitions for the Common UNIX Printing System
  *   (CUPS) scheduler.
  *
+ *   Copyright 2007 by Apple Inc.
  *   Copyright 1997-2006 by Easy Software Products, all rights reserved.
  *
  *   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
+ *   property of Apple Inc. and are protected by Federal copyright
+ *   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
  *   "LICENSE" 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
+ *   file is missing or damaged, see the license at "http://www.cups.org/".
  */
 
 /*
@@ -57,5 +48,5 @@ extern void           cupsdNetIFUpdate(void);
 
 
 /*
- * End of "$Id: network.h 6090 2006-11-14 16:35:27Z mike $".
+ * End of "$Id: network.h 6649 2007-07-11 21:46:42Z mike $".
  */