提交 9208b778 编写于 作者: A asaha

Merge

......@@ -380,6 +380,8 @@ b6d03a810a61116268fea08517a9632bd66a7363 jdk8u40-b22
5dd2ad6c7911a1e21f15a28f13ffad662378a3be jdk8u40-b23
5b37e6757d7c95c9c58b07fb3c9eba234567385a jdk8u40-b24
e26f15704e37f28acebb22378c4785891aaec637 jdk8u40-b25
7a552439756eaad0618ae82a94c034edb65f5d7e jdk8u40-b26
12deacac825756e266e91a906db9edab73c4c90b jdk8u40-b27
ec4bcc6e4dcf190a165106627ed3eef1e7d94d0c jdk8u45-b00
635ba0c81b894a88ff737fefc9d7af398f761643 jdk8u45-b01
801c65bb74b770600a2d48189764e416e5cfe265 jdk8u45-b02
......@@ -390,6 +392,10 @@ ec4bcc6e4dcf190a165106627ed3eef1e7d94d0c jdk8u45-b00
74ef61db0fe02e3eaa5156a7bab9f00f2a2143de jdk8u45-b07
0c10bc33556383b8e665998c62145a8398e7f7ef jdk8u45-b08
733d16eb42cb105749588c9b93cc408155ed99ad jdk8u45-b09
9a343fd13810a8f09d3dd4a9e2e20791bb866166 jdk8u45-b10
6738b8755c80905e3eecedf94e27f03d23f02ba9 jdk8u45-b11
54709b761404dd3bc1b58acf5582fa9bd70ff59a jdk8u45-b12
6b2f1bf5c72873d01b37103fc20ac7a63e7881dd jdk8u45-b13
ae4980d195b64eec58884b233d7efd312205bac8 jdk8u60-b00
acf81f6fb265c1564b16fd8202a324a9022e204b jdk8u60-b01
2ca2e2430370d441cbe7999b76b57cadf0060327 jdk8u60-b02
......
......@@ -1250,7 +1250,7 @@ included with JDK 8 and OpenJDK 8 source distributions.
-------------------------------------------------------------------------------
%% This notice is provided with respect to libpng 1.5.4, which may be
%% This notice is provided with respect to libpng 1.6.16, which may be
included with JRE 8, JDK 8, and OpenJDK 8.
--- begin of LICENSE ---
......@@ -1266,8 +1266,8 @@ this sentence.
This code is released under the libpng license.
libpng versions 1.2.6, August 15, 2004, through 1.5.4, July 7, 2011, are
Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are
libpng versions 1.2.6, August 15, 2004, through 1.6.16, December 22, 2014, are
Copyright (c) 2004, 2006-2014 Glenn Randers-Pehrson, and are
distributed according to the same disclaimer and license as libpng-1.2.5
with the following individual added to the list of Contributing Authors
......@@ -1364,7 +1364,7 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson
glennrp at users.sourceforge.net
July 7, 2011
December 22, 2014
--- end of LICENSE ---
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册