changeset 754:487620ebb019

Merge
author lana
date Thu, 09 Feb 2017 18:10:11 +0000
parents 78a7ade93491 42993fcbd8f3
children b7e70e1e0154
files
diffstat 1 files changed, 1 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- 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