Return-Path: Delivered-To: apmail-httpd-cvs-archive@www.apache.org Received: (qmail 84035 invoked from network); 2 Jan 2008 20:31:40 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 2 Jan 2008 20:31:40 -0000 Received: (qmail 49028 invoked by uid 500); 2 Jan 2008 20:31:28 -0000 Delivered-To: apmail-httpd-cvs-archive@httpd.apache.org Received: (qmail 48966 invoked by uid 500); 2 Jan 2008 20:31:28 -0000 Mailing-List: contact cvs-help@httpd.apache.org; run by ezmlm Precedence: bulk Reply-To: dev@httpd.apache.org list-help: list-unsubscribe: List-Post: List-Id: Delivered-To: mailing list cvs@httpd.apache.org Received: (qmail 48955 invoked by uid 99); 2 Jan 2008 20:31:28 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jan 2008 12:31:28 -0800 X-ASF-Spam-Status: No, hits=-100.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.3] (HELO eris.apache.org) (140.211.11.3) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Jan 2008 20:31:24 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id 4A1DB1A983A; Wed, 2 Jan 2008 12:31:16 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r608208 - /httpd/httpd/trunk/docs/conf/mime.types Date: Wed, 02 Jan 2008 20:31:15 -0000 To: cvs@httpd.apache.org From: fielding@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20080102203116.4A1DB1A983A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: fielding Date: Wed Jan 2 12:31:13 2008 New Revision: 608208 URL: http://svn.apache.org/viewvc?rev=608208&view=rev Log: revert move to image/vnd.microsoft.icon because everyone uses image/x-icon Modified: httpd/httpd/trunk/docs/conf/mime.types Modified: httpd/httpd/trunk/docs/conf/mime.types URL: http://svn.apache.org/viewvc/httpd/httpd/trunk/docs/conf/mime.types?rev=608208&r1=608207&r2=608208&view=diff ============================================================================== --- httpd/httpd/trunk/docs/conf/mime.types (original) +++ httpd/httpd/trunk/docs/conf/mime.types Wed Jan 2 12:31:13 2008 @@ -812,7 +812,7 @@ image/vnd.fujixerox.edmics-mmr mmr image/vnd.fujixerox.edmics-rlc rlc image/vnd.globalgraphics.pgb -image/vnd.microsoft.icon ico +image/vnd.microsoft.icon image/vnd.mix image/vnd.ms-modi mdi image/vnd.net-fpx npx @@ -824,7 +824,7 @@ image/vnd.xiff xif image/x-cmu-raster ras image/x-cmx cmx -image/x-icon +image/x-icon ico image/x-pcx pcx image/x-pict pic pct image/x-portable-anymap pnm