Merge

7cb405e1 · asaha · 8cbec380 · f11f8830 · 7cb405e1 · 7cb405e1
隐藏空白更改
内联并排

Showing with 3 addition and 2 deletion

.hgtags .hgtags +1 -0

THIRD_PARTY_README THIRD_PARTY_README +2 -2

未找到文件。
--- a/.hgtags
+++ b/.hgtags
@@ -688,6 +688,7 @@ e47b42f887ba51e27db2a9882eb10d2ee16830aa jdk8u141-b10
 31e8c2a1e8f7637d0f5e5b920b30536eee87d665 jdk8u141-b12
 2c1a74bca789006be1cc7fc642048ade06fef2f2 jdk8u141-b13
 8c329eab0dac3630854a56f2485f9862040bffdf jdk8u141-b14
+dfb2e076f381c4ea8c84ae0309a2072ec3ac92b8 jdk8u141-b15
 6a5473932aff2d9c0df2cdc6e1800dd7c374232f jdk8u151-b00
 681ab42e7c73ba151256f88b7877f5ca4101e63d jdk8u151-b01
 296b5f81b2c28b5d7eea4a7051eae0ec34f5ec05 jdk8u151-b02

--- 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