Load cups into easysw/current.

[thirdparty/cups.git] / conf / mime.convs.in

diff --git a/conf/mime.convs.in b/conf/mime.convs.in
index ec32918713486fb9af6c7613892e51c2aec80a8a..108e507b264ff85ebdb76bb23137af4e5e6511df 100644 (file)
--- a/conf/mime.convs.in
+++ b/conf/mime.convs.in
@@ -1,5 +1,5 @@
 #
-# "$Id: mime.convs.in 6566 2007-06-18 23:56:23Z mike $"
+# "$Id: mime.convs.in 6649 2007-07-11 21:46:42Z mike $"
 #
 #   DO NOT EDIT THIS FILE, AS IT IS OVERWRITTEN WHEN YOU INSTALL NEW
 #   VERSIONS OF CUPS.  Instead, create a "local.convs" file that
@@ -7,23 +7,14 @@
 #
 #   MIME converts file for the Common UNIX Printing System (CUPS).
 #
+#   Copyright 2007 by Apple Inc.
 #   Copyright 1997-2007 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/".
 #
 
 ########################################################################
@@ -118,5 +109,5 @@ image/x-sun-raster  application/vnd.cups-raster     100     imagetoraster
 @DEFAULT_RAW_PRINTING@application/octet-stream application/vnd.cups-raw        0       -
 
 #
-# End of "$Id: mime.convs.in 6566 2007-06-18 23:56:23Z mike $".
+# End of "$Id: mime.convs.in 6649 2007-07-11 21:46:42Z mike $".
 #