summaryrefslogtreecommitdiff
path: root/conf
diff options
context:
space:
mode:
authorDongHun Kwak <dh0128.kwak@samsung.com>2017-09-13 11:54:26 +0900
committerDongHun Kwak <dh0128.kwak@samsung.com>2017-09-13 11:54:32 +0900
commitcc669fe9bb14b037c6c7d88bea780cf053664b15 (patch)
tree645f5d4f7de33d361e6f83fe8ec2e815c9335840 /conf
parent5ed126d6de36f982f1f800f54d468dac5730050d (diff)
downloadcups-cc669fe9bb14b037c6c7d88bea780cf053664b15.tar.gz
cups-cc669fe9bb14b037c6c7d88bea780cf053664b15.tar.bz2
cups-cc669fe9bb14b037c6c7d88bea780cf053664b15.zip
Imported Upstream version 2.2.4upstream/2.2.4
Change-Id: I6e6af59f8c880d483a83eb33c963ac9fb5ec2e4d Signed-off-by: DongHun Kwak <dh0128.kwak@samsung.com>
Diffstat (limited to 'conf')
-rw-r--r--conf/mime.types10
1 files changed, 2 insertions, 8 deletions
diff --git a/conf/mime.types b/conf/mime.types
index 1c50f16..fa53714 100644
--- a/conf/mime.types
+++ b/conf/mime.types
@@ -5,7 +5,7 @@
# VERSIONS OF CUPS. Instead, create a "local.types" file that
# reflects your local configuration changes.
#
-# Copyright 2007-2016 by Apple Inc.
+# Copyright 2007-2017 by Apple Inc.
# Copyright 1997-2007 by Easy Software Products.
#
# These coded instructions, statements, and computer programs are the
@@ -79,12 +79,6 @@ application/postscript ai eps ps string(0,%!) string(0,<04>%!) \
(contains(0,4096,<0a>%!) + \
!contains(0,4096,"ENTER LANGUAGE")))
-application/g-code gcode
-application/sla stl string(0,"solid ") + contains(0,4096,"facet") + contains(0,4096,"vertex")
-application/vnd.makerbot-s3g x3g
-model/amf amf
-model/vnd.collada+xml dae
-
########################################################################
#
@@ -131,7 +125,7 @@ application/x-shell sh printable(0,1024) + string(0,#!) +\
contains(2,80,/sh) contains(2,80,/zsh))
application/x-csource c cxx cpp cc C h hpp \
printable(0,1024) + ! css + \
- (string(0,/*) string(0,//)
+ (string(0,/*) string(0,//) \
string(0,#include) contains(0,1024,<0a>#include) \
string(0,#define) contains(0,1024,<0a>#define))
text/html html htm printable(0,1024) +\