# HG changeset patch
# User lana
# Date 1486663811 0
# Node ID 487620ebb019cd2c39b832d5a88418d0ef301ed1
# Parent  78a7ade93491b730675944ccb2d83e27fe19fde0# Parent  42993fcbd8f324776e01f59fbdb2cef90ad9145b
Merge

diff -r 78a7ade93491 -r 487620ebb019 src/java.activation/share/classes/META-INF/mimetypes.default
--- a/src/java.activation/share/classes/META-INF/mimetypes.default	Thu Feb 09 17:21:47 2017 +0000
+++ b/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