Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorlana
Thu, 09 Feb 2017 18:10:11 +0000
changeset 43751 109ad0a7ed5e
parent 43641 5236b4e026a9 (current diff)
parent 43750 01665397c70d (diff)
child 43752 3c68ef249093
Merge
--- a/jaxws/src/java.activation/share/classes/META-INF/mimetypes.default	Thu Feb 09 17:21:47 2017 +0000
+++ b/jaxws/src/java.activation/share/classes/META-INF/mimetypes.default	Thu Feb 09 18:10:11 2017 +0000
@@ -7,6 +7,7 @@
 image/ief		ief
 image/jpeg		jpeg jpg jpe JPG
 image/tiff		tiff tif
+image/png		png PNG
 image/x-xwindowdump	xwd
 application/postscript	ai eps ps
 application/rtf		rtf
jdk-sandbox