summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2009-05-22 21:50:50 +0000
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2009-05-22 21:50:50 +0000
commitb0f6947b4de3f93c46c35af45cf83108db1b9224 (patch)
tree6d09c698fc8fb27c29fa52f952d38167cc50f7e9 /conf
parent68b10830fa5eca364644a90bb564821698611ff7 (diff)
downloadcups-b0f6947b4de3f93c46c35af45cf83108db1b9224.tar.gz
Merge changes from CUPS 1.4svn-r8679.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1531 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'conf')
-rw-r--r--conf/mime.convs.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/conf/mime.convs.in b/conf/mime.convs.in
index 9416b2de7..8cbba9d62 100644
--- a/conf/mime.convs.in
+++ b/conf/mime.convs.in
@@ -7,7 +7,7 @@
#
# MIME converts file for the Common UNIX Printing System (CUPS).
#
-# Copyright 2007-2008 by Apple Inc.
+# Copyright 2007-2009 by Apple Inc.
# Copyright 1997-2007 by Easy Software Products.
#
# These coded instructions, statements, and computer programs are the
@@ -38,7 +38,7 @@
# PostScript filters
#
-application/pdf application/postscript 33 pdftops
+application/pdf application/vnd.cups-postscript 66 pdftops
application/postscript application/vnd.cups-postscript 66 pstops
application/vnd.hp-HPGL application/postscript 66 hpgltops
application/x-cshell application/postscript 33 texttops