Return-Path: Delivered-To: apmail-jackrabbit-commits-archive@www.apache.org Received: (qmail 22264 invoked from network); 15 Feb 2007 22:26:29 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 15 Feb 2007 22:26:29 -0000 Received: (qmail 19625 invoked by uid 500); 15 Feb 2007 22:26:36 -0000 Delivered-To: apmail-jackrabbit-commits-archive@jackrabbit.apache.org Received: (qmail 19552 invoked by uid 500); 15 Feb 2007 22:26:36 -0000 Mailing-List: contact commits-help@jackrabbit.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jackrabbit.apache.org Delivered-To: mailing list commits@jackrabbit.apache.org Received: (qmail 19543 invoked by uid 99); 15 Feb 2007 22:26:36 -0000 Received: from herse.apache.org (HELO herse.apache.org) (140.211.11.133) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 15 Feb 2007 14:26:36 -0800 X-ASF-Spam-Status: No, hits=-9.4 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME 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; Thu, 15 Feb 2007 14:26:28 -0800 Received: by eris.apache.org (Postfix, from userid 65534) id 28F1A1A981A; Thu, 15 Feb 2007 14:26:08 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r508203 - /jackrabbit/branches/1.2/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/mimetypes.properties Date: Thu, 15 Feb 2007 22:26:07 -0000 To: commits@jackrabbit.apache.org From: jukka@apache.org X-Mailer: svnmailer-1.1.0 Message-Id: <20070215222608.28F1A1A981A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: jukka Date: Thu Feb 15 14:26:07 2007 New Revision: 508203 URL: http://svn.apache.org/viewvc?view=rev&rev=508203 Log: 1.2: Merged revision 502343 (JCR-722) Modified: jackrabbit/branches/1.2/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/mimetypes.properties Modified: jackrabbit/branches/1.2/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/mimetypes.properties URL: http://svn.apache.org/viewvc/jackrabbit/branches/1.2/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/mimetypes.properties?view=diff&rev=508203&r1=508202&r2=508203 ============================================================================== --- jackrabbit/branches/1.2/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/mimetypes.properties (original) +++ jackrabbit/branches/1.2/jackrabbit-jcr-server/src/main/java/org/apache/jackrabbit/server/io/mimetypes.properties Thu Feb 15 14:26:07 2007 @@ -70,7 +70,7 @@ mesh=model/mesh mid=audio/midi midi=audio/midi -mif=application/vnd=mif +mif=application/vnd.mif mov=video/quicktime movie=video/x-sgi-movie mp2=audio/mpeg @@ -91,7 +91,7 @@ png=image/png pnm=image/x-portable-anymap ppm=image/x-portable-pixmap -ppt=application/vnd=ms-powerpoint +ppt=application/vnd.ms-powerpoint ps=application/postscript qhtml=text/qhtml qt=video/quicktime