Merge

5bf2e3f1 · asaha · 08760bda · f11f8830 · 5bf2e3f1 · 5bf2e3f1
显示空白变更内容
内联并排

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
 18eb73eb84c5395b3efcafa43ce224565eca02b3 jdk8u122-b00
 9e615ea961fe5732813ed7b273606e7337ea2234 jdk8u122-b01
 2f0b11882cb7ddb10e35682ab9e8343919a71c54 jdk8u122-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