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