# HG changeset patch
# User lana
# Date 1486663811 0
# Node ID 109ad0a7ed5ee6b52bc1c373ae617519f2e8fe69
# Parent  5236b4e026a96e83bf83def34b808fa539e2654b# Parent  01665397c70dbde5832e726f22d11f2704d22ab6
Merge

diff -r 5236b4e026a9 -r 109ad0a7ed5e jaxws/src/java.activation/share/classes/META-INF/mimetypes.default
--- 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