From: Michael R Sweet <michaelrsweet@gmail.com>
Date: Wed, 31 May 2017 12:50:47 +0000 (-0400)
Subject: Fix typo in mime.types file.
X-Git-Tag: v2.2.4~58
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4cfbd5f897d652cc1c788e7acc65cba3c73ee8e8;p=thirdparty%2Fcups.git

Fix typo in mime.types file.
---

diff --git a/CHANGES.md b/CHANGES.md
index 52d48b058e..1a5e8b25d4 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -1,4 +1,4 @@
-CHANGES - 2.2.4 - 2017-05-26
+CHANGES - 2.2.4 - 2017-05-31
 ============================
 
 CHANGES IN CUPS V2.2.4
@@ -22,6 +22,7 @@ CHANGES IN CUPS V2.2.4
   (Issue #5005)
 - The `lp` and `lpr` commands now support printing to network printers that
   haven't yet been added (Issue #5006)
+- Fixed a typo in the mime.types file.
 
 
 CHANGES IN CUPS V2.2.3
diff --git a/conf/mime.types b/conf/mime.types
index 1c50f16a66..2e5c6daca3 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
@@ -131,7 +131,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) +\