diff options
| author | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2009-08-29 06:12:06 +0000 |
|---|---|---|
| committer | msweet <msweet@a1ca3aef-8c08-0410-bb20-df032aa958be> | 2009-08-29 06:12:06 +0000 |
| commit | 7a0cbd5e5715d715c3fddfaace2f800ef820d328 (patch) | |
| tree | 4f6b5042db1bbe7c1d262ec4eecbb8936a6a0f1f /conf | |
| parent | ee6ddad2570bbfe4ac3c3378b8765532b6d7cde5 (diff) | |
| download | cups-7a0cbd5e5715d715c3fddfaace2f800ef820d328.tar.gz | |
Import changes from CUPS 1.4.1 (r8801)
git-svn-id: svn+ssh://src.apple.com/svn/cups/easysw/current@1649 a1ca3aef-8c08-0410-bb20-df032aa958be
Diffstat (limited to 'conf')
| -rw-r--r-- | conf/mime.types | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/conf/mime.types b/conf/mime.types index ba97930d5..8ef1c06a9 100644 --- a/conf/mime.types +++ b/conf/mime.types @@ -95,7 +95,7 @@ application/vnd.hp-HPGL hpgl \ image/gif gif string(0,GIF87a) string(0,GIF89a) image/png png string(0,<89>PNG) -image/jpeg jpeg jpg jpe string(0,<FFD8FF>) &&\ +image/jpeg jpeg jpg jpe string(0,<FFD8FF>) +\ (char(3,0xe0) char(3,0xe1) char(3,0xe2) char(3,0xe3)\ char(3,0xe4) char(3,0xe5) char(3,0xe6) char(3,0xe7)\ char(3,0xe8) char(3,0xe9) char(3,0xea) char(3,0xeb)\ @@ -114,7 +114,7 @@ image/x-sun-raster ras string(0,<59a66a95>) #image/fpx fpx image/x-alias pix short(8,8) short(8,24) -image/x-bitmap bmp string(0,BM) && !printable(2,14) +image/x-bitmap bmp string(0,BM) + !printable(2,14) image/x-icon ico ######################################################################## |