diff options
author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2011-08-09 21:32:14 +0000 |
---|---|---|
committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2011-08-09 21:32:14 +0000 |
commit | 771bd8cbffe1ffb06d90b2c7f00191830e6b738c (patch) | |
tree | b243e530d49ceb689d2597438ed7fbdc428e03a0 /conf | |
parent | bd8b6777d63a527fce541b948c3305e5a59ed2af (diff) | |
download | cups-771bd8cbffe1ffb06d90b2c7f00191830e6b738c.tar.gz |
Merge changes from CUPS 1.5.1-r9875.
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@3363 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'conf')
-rw-r--r-- | conf/mime.types | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/conf/mime.types b/conf/mime.types index 77944f4bb..217d75bee 100644 --- a/conf/mime.types +++ b/conf/mime.types @@ -92,7 +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/pwg-raster string(0,"RaS2") + string(4,PwgRaster<00>) 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 |