diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2011-04-11 18:53:27 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2011-04-11 18:53:27 +0000 |
| commit | 07ed0e9a4385437b52e7195b681e600c2f1c5623 (patch) | |
| tree | 6dda615ae2f467bbc8c311ba8066bf63c20ec1d7 /conf | |
| parent | 84315f460a5c9eb38f7fcc4204acf98ed2b29406 (diff) | |
| download | cups-07ed0e9a4385437b52e7195b681e600c2f1c5623.tar.gz | |
Merge changes from CUPS 1.5svn-r9675.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3122 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/mime.convs.in | 7 | ||||
| -rw-r--r-- | conf/mime.types | 5 |
2 files changed, 8 insertions, 4 deletions
diff --git a/conf/mime.convs.in b/conf/mime.convs.in index 9e6796ad4..804546c9e 100644 --- a/conf/mime.convs.in +++ b/conf/mime.convs.in @@ -5,9 +5,9 @@ # VERSIONS OF CUPS. Instead, create a "local.convs" file that # reflects your local configuration changes. # -# MIME converts file for the Common UNIX Printing System (CUPS). +# Base MIME conversions file for CUPS. # -# Copyright 2007-2010 by Apple Inc. +# Copyright 2007-2011 by Apple Inc. # Copyright 1997-2007 by Easy Software Products. # # These coded instructions, statements, and computer programs are the @@ -88,6 +88,9 @@ image/x-sun-raster application/vnd.cups-raster 100 imagetoraster # pstoraster is part of GPL Ghostscript... application/vnd.cups-postscript application/vnd.cups-raster 100 pstoraster +# PWG Raster filter for IPP Everywhere... +application/vnd.cups-raster image/pwg-raster 100 rastertopwg + ######################################################################## # # Raw filter... diff --git a/conf/mime.types b/conf/mime.types index dd28daaf6..77944f4bb 100644 --- a/conf/mime.types +++ b/conf/mime.types @@ -1,13 +1,13 @@ # # "$Id: mime.types 7670 2008-06-17 22:42:08Z mike $" # -# MIME types file for the Common UNIX Printing System (CUPS). +# Base MIME types file for CUPS. # # DO NOT EDIT THIS FILE, AS IT IS OVERWRITTEN WHEN YOU INSTALL NEW # VERSIONS OF CUPS. Instead, create a "local.types" file that # reflects your local configuration changes. # -# Copyright 2007-2010 by Apple Inc. +# Copyright 2007-2011 by Apple Inc. # Copyright 1997-2007 by Easy Software Products. # # These coded instructions, statements, and computer programs are the @@ -92,6 +92,7 @@ image/jpeg jpeg jpg jpe string(0,<FFD8FF>) +\ char(3,0xe4) char(3,0xe5) char(3,0xe6) char(3,0xe7)\ char(3,0xe8) char(3,0xe9) char(3,0xea) char(3,0xeb)\ char(3,0xec) char(3,0xed) char(3,0xee) char(3,0xef)) +image/pwg-raster string(0,"RaS2") + string(356,<0000000000000000>) priority(100) image/tiff tiff tif string(0,MM<002A>) string(0,II<2A00>) image/x-photocd pcd string(2048,PCD_IPI) image/x-portable-anymap pnm |