Merge

2017-02-09 18:10:11 +00:00 · 2017-02-09 18:10:11 +00:00 · 80b625a6d8
commit 80b625a6d8
parent a5ab73192c 18cb39a774
1 changed files with 1 additions and 0 deletions
--- a/jaxws/src/java.activation/share/classes/META-INF/mimetypes.default
+++ b/jaxws/src/java.activation/share/classes/META-INF/mimetypes.default
@ -7,6 +7,7 @@ image/gif		gif GIF
 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