Merge

f57a159a · asaha · e47e6632 · 51bbd0cb · f57a159a · f57a159a
隐藏空白更改
内联并排

Showing with 7 addition and 2 deletion

.hgtags .hgtags +5 -0

THIRD_PARTY_README THIRD_PARTY_README +2 -2

未找到文件。
--- a/.hgtags
+++ b/.hgtags
@@ -721,9 +721,14 @@ e2abef6f10b9b2946ce8f5f851af67a764bbe57d jdk8u141-b08
 b5259d2465fa61256f485860f986bd575f13fe92 jdk8u141-b12
 9a5ddb594b491ec32e9fafa7008631291ab66d6e jdk8u141-b13
 553043f3a2319af6fd6bc704bc8fd7fa4500ee80 jdk8u141-b14
+027f6df9fe82624fb7d489ffd848a26796de4868 jdk8u141-b15
+716e712f0db45c8231208bc70ab4d2a8a40c4d3a jdk8u141-b31
+09c2459991619ef7061ad2bc66373ed29f500acf jdk8u141-b32
 4d69601f88c30e9f05e3b56c6d38a2f3eb47d477 jdk8u151-b00
 f081adae3486f8728affc89213c2cd1dd0ac9467 jdk8u151-b01
 732e1bab2660d21227dce26190d4a31dd9785a7f jdk8u151-b02
+a1d0ecd858bbc397f7683a9e0a3fd1620c327d64 jdk8u151-b03
+d0a51eb7da2995e864af5dc4d010aef0cb3f9e38 jdk8u151-b04
 4d69601f88c30e9f05e3b56c6d38a2f3eb47d477 jdk8u151-b00
 a1d0ecd858bbc397f7683a9e0a3fd1620c327d64 jdk8u151-b03
 9a9ce479b92f1b4d9d436fb857d70c3d2b59a20c jdk8u122-b00

--- a/THIRD_PARTY_README
+++ b/THIRD_PARTY_README
@@ -2808,12 +2808,12 @@ SOFTWARE.

 -------------------------------------------------------------------------------

-%% This notice is provided with respect to zlib v1.2.11, which may be included 
+%% This notice is provided with respect to zlib v1.2.8, which may be included 
 with JRE 8, JDK 8, and OpenJDK 8.

 --- begin of LICENSE ---

-  version 1.2.11, January 15th, 2017
+  version 1.2.8, April 28th, 2013

  Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler