summaryrefslogtreecommitdiff
path: root/conf/mime.convs.in
diff options
context:
space:
mode:
authormsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2007-08-09 16:35:06 +0000
committermsweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be>2007-08-09 16:35:06 +0000
commit7ff4fea9bc80dfaaa12179a72dd34210cad13061 (patch)
tree645259a14a8127496de27f4df1e4db45ea4e7c0f /conf/mime.convs.in
parentc24d21342fd8b3bb674364f52d01c6c4181d8ee2 (diff)
downloadcups-7ff4fea9bc80dfaaa12179a72dd34210cad13061.tar.gz
Merge changes from r6758 to r6781.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@388 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'conf/mime.convs.in')
-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 108e507b2..ad9ab9041 100644
--- a/conf/mime.convs.in
+++ b/conf/mime.convs.in
@@ -95,8 +95,8 @@ image/x-xpixmap application/vnd.cups-raster 100 imagetoraster
#image/x-xwindowdump application/vnd.cups-raster 100 imagetoraster
image/x-sun-raster application/vnd.cups-raster 100 imagetoraster
-# pstoraster is now part of ESP Ghostscript...
-#application/vnd.cups-postscript application/vnd.cups-raster 100 pstoraster
+# pstoraster is part of GPL Ghostscript...
+application/vnd.cups-postscript application/vnd.cups-raster 100 pstoraster
########################################################################
#