From d36051f5defa0a287bafa95e1df53904e3f73463 Mon Sep 17 00:00:00 2001 From: Jesse McConnell Date: Mon, 19 Jul 2010 15:46:07 +0000 Subject: [PATCH] 320264 remove a duplicate mime entry git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2153 7e9141cc-0065-0410-87d8-b60c137991c4 --- VERSION.txt | 1 + .../src/main/resources/org/eclipse/jetty/http/mime.properties | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/VERSION.txt b/VERSION.txt index a726790b749..c1bf093e6a6 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1,5 +1,6 @@ jetty-7.2-SNAPSHOT + + 320264 dupliate mime entry + 319334 Concurrent, sharable ResourceCache + 319370 WebAppClassLoader.Context + 320073 Reconsile configuration mechanism diff --git a/jetty-http/src/main/resources/org/eclipse/jetty/http/mime.properties b/jetty-http/src/main/resources/org/eclipse/jetty/http/mime.properties index 2b05ffc8bf7..42f5d346d97 100644 --- a/jetty-http/src/main/resources/org/eclipse/jetty/http/mime.properties +++ b/jetty-http/src/main/resources/org/eclipse/jetty/http/mime.properties @@ -172,7 +172,6 @@ xhtml = application/xhtml+xml xls = application/vnd.ms-excel xml = application/xml xpm = image/x-xpixmap -xpm = image/x-xpixmap xsl = application/xml xslt = application/xslt+xml xul = application/vnd.mozilla.xul+xml