提交 36f66476 编写于 作者: A asaha

Merge

...@@ -378,6 +378,8 @@ c3d6d1a5339952fbe4124e700407b7211446c99c jdk8u40-b20 ...@@ -378,6 +378,8 @@ c3d6d1a5339952fbe4124e700407b7211446c99c jdk8u40-b20
fb294b49373bda0b3afc7f011d64ecefed73b42e jdk8u40-b23 fb294b49373bda0b3afc7f011d64ecefed73b42e jdk8u40-b23
c5d4ffa220f3824c2ea5d39dc99d41a9df9e5ae5 jdk8u40-b24 c5d4ffa220f3824c2ea5d39dc99d41a9df9e5ae5 jdk8u40-b24
991141080b2078e67179ff307a5051e59431762c jdk8u40-b25 991141080b2078e67179ff307a5051e59431762c jdk8u40-b25
2904142783dd0a9e12195a84c7dcdb3d8278b1b1 jdk8u40-b26
83eca922346e27ec42645e9630c04fbaec5eaf0f jdk8u40-b27
dbae37f50c43453f7d6f22d96adc8b5b6cd1e90d jdk8u45-b00 dbae37f50c43453f7d6f22d96adc8b5b6cd1e90d jdk8u45-b00
244e6dc772877dfae6286530f58e11a210a48a3c jdk8u45-b01 244e6dc772877dfae6286530f58e11a210a48a3c jdk8u45-b01
401ec76887623a29d3f868f9f9b18b42838d2e92 jdk8u45-b02 401ec76887623a29d3f868f9f9b18b42838d2e92 jdk8u45-b02
...@@ -388,6 +390,10 @@ dbae37f50c43453f7d6f22d96adc8b5b6cd1e90d jdk8u45-b00 ...@@ -388,6 +390,10 @@ dbae37f50c43453f7d6f22d96adc8b5b6cd1e90d jdk8u45-b00
460238ab73ce27112b3d0d7236366960f9898259 jdk8u45-b07 460238ab73ce27112b3d0d7236366960f9898259 jdk8u45-b07
6dd7fd9f027bf037517feae2a571848aa8fbc20f jdk8u45-b08 6dd7fd9f027bf037517feae2a571848aa8fbc20f jdk8u45-b08
db16aa5c73c99d0050246660ebebb6166002ff57 jdk8u45-b09 db16aa5c73c99d0050246660ebebb6166002ff57 jdk8u45-b09
572895f19937b7aadc8c27c5e83887bf40f5bcff jdk8u45-b10
0547ef2be3b303923b30ce78e1ab832725483f4e jdk8u45-b11
4f89bbda7b4532b9f6eeee8c41b7a3b38570ae93 jdk8u45-b12
5ce022bca792453a7efedaed419a9d763d7a9fc3 jdk8u45-b13
0c514d1fd006fc79d35b670de10c370c8d559db7 jdk8u60-b00 0c514d1fd006fc79d35b670de10c370c8d559db7 jdk8u60-b00
0ba07c272e33c93377a5d7ed98b9de873cc91980 jdk8u60-b01 0ba07c272e33c93377a5d7ed98b9de873cc91980 jdk8u60-b01
387cf62ce7895dd5e067aaa51faa93d5c078583e jdk8u60-b02 387cf62ce7895dd5e067aaa51faa93d5c078583e jdk8u60-b02
......
...@@ -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.
先完成此消息的编辑!
想要评论请 注册