You need to sign in or sign up before continuing.
提交 68388771 编写于 作者: A asaha

Merge

...@@ -592,6 +592,8 @@ d2e9a6bec4f2eec8506eed16f7324992a85d8480 hs25.40-b24 ...@@ -592,6 +592,8 @@ d2e9a6bec4f2eec8506eed16f7324992a85d8480 hs25.40-b24
0e67683b700174eab71ea205d1cfa4f1cf4523ba jdk8u40-b23 0e67683b700174eab71ea205d1cfa4f1cf4523ba jdk8u40-b23
fa4e797f61e6dda1a60e06944018213bff2a1b76 jdk8u40-b24 fa4e797f61e6dda1a60e06944018213bff2a1b76 jdk8u40-b24
698dd28ecc785ffc43e3f12266b13e85382c26a8 jdk8u40-b25 698dd28ecc785ffc43e3f12266b13e85382c26a8 jdk8u40-b25
f39b6944ad447269b81e06ca5da9edff9e9e67c8 jdk8u40-b26
6824e2475e0432e27f9cc51838bc34ea5fbf5113 jdk8u40-b27
b95f13f05f553309cd74d6ccf8fcedb259c6716c jdk8u45-b00 b95f13f05f553309cd74d6ccf8fcedb259c6716c jdk8u45-b00
41c3c456e326185053f0654be838f4b0bfb38078 jdk8u45-b01 41c3c456e326185053f0654be838f4b0bfb38078 jdk8u45-b01
626fd8c2eec63e2a2dff3839bfe12c0431bf00a4 jdk8u45-b02 626fd8c2eec63e2a2dff3839bfe12c0431bf00a4 jdk8u45-b02
...@@ -602,6 +604,10 @@ f41aa01b0a043611ee0abcb81a40f7d80085ec27 jdk8u45-b03 ...@@ -602,6 +604,10 @@ f41aa01b0a043611ee0abcb81a40f7d80085ec27 jdk8u45-b03
5871f3dd9b4a2c4b44e7da2184f4430323e0c04b jdk8u45-b07 5871f3dd9b4a2c4b44e7da2184f4430323e0c04b jdk8u45-b07
35c7330b68e21d0dfaaedaaf74b794fd10606e9c jdk8u45-b08 35c7330b68e21d0dfaaedaaf74b794fd10606e9c jdk8u45-b08
35d8318de0b6d4e68e2e0a04f6e20cafd113ca54 jdk8u45-b09 35d8318de0b6d4e68e2e0a04f6e20cafd113ca54 jdk8u45-b09
a9f5786079202b74b3651e1097c0b2341b2178b9 jdk8u45-b10
f4822d12204179e6a3e7aaf98991b6171670cbf2 jdk8u45-b11
dc29108bcbcbfcd49eaa9135368306dc85db73a6 jdk8u45-b12
efbf340fc7f56e49735111c23cef030413146409 jdk8u45-b13
d9349fa8822336e0244da0a8448f3e6b2d62741d jdk8u60-b00 d9349fa8822336e0244da0a8448f3e6b2d62741d jdk8u60-b00
d9349fa8822336e0244da0a8448f3e6b2d62741d hs25.60-b00 d9349fa8822336e0244da0a8448f3e6b2d62741d hs25.60-b00
ebf89088c08ab0508b9002b48dd3d68a340259af hs25.60-b01 ebf89088c08ab0508b9002b48dd3d68a340259af hs25.60-b01
......
...@@ -1250,7 +1250,7 @@ included with JDK 8 and OpenJDK 8 source distributions. ...@@ -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. included with JRE 8, JDK 8, and OpenJDK 8.
--- begin of LICENSE --- --- begin of LICENSE ---
...@@ -1266,8 +1266,8 @@ this sentence. ...@@ -1266,8 +1266,8 @@ this sentence.
This code is released under the libpng license. This code is released under the libpng license.
libpng versions 1.2.6, August 15, 2004, through 1.5.4, July 7, 2011, are libpng versions 1.2.6, August 15, 2004, through 1.6.16, December 22, 2014, are
Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are Copyright (c) 2004, 2006-2014 Glenn Randers-Pehrson, and are
distributed according to the same disclaimer and license as libpng-1.2.5 distributed according to the same disclaimer and license as libpng-1.2.5
with the following individual added to the list of Contributing Authors with the following individual added to the list of Contributing Authors
...@@ -1364,7 +1364,7 @@ certification mark of the Open Source Initiative. ...@@ -1364,7 +1364,7 @@ certification mark of the Open Source Initiative.
Glenn Randers-Pehrson Glenn Randers-Pehrson
glennrp at users.sourceforge.net glennrp at users.sourceforge.net
July 7, 2011 December 22, 2014
--- end of LICENSE --- --- end of LICENSE ---
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册