Merge

161c62ad · asaha · 813a1894 · f194de1a · 161c62ad · 161c62ad
显示空白变更内容
内联并排

Showing with 6 addition and 2 deletion

.hgtags .hgtags +4 -0

THIRD_PARTY_README THIRD_PARTY_README +2 -2

未找到文件。
--- a/.hgtags
+++ b/.hgtags
@@ -754,10 +754,14 @@ f4091c5aed03f482ce64e406850b3ec6a7ed71ef jdk8u141-b11
 87a9107675a5a508d99a00f872f01e5bb42cfc02 jdk8u141-b12
 ad04b672d6f92dcfbe9e72de041bd05d26a31fde jdk8u141-b13
 2232cdb74345eeeeffc13d4f6b1cbcae068c5998 jdk8u141-b14
+4f242f33e89a7900f2fcdcd9402058b6d01f340c jdk8u141-b15
+e03501807899791ff7888884bcf47eb39be594bb jdk8u141-b31
+1bbe5d997ab4e030dd961ab78e11ddae1bc6786c jdk8u141-b32
 2dbdceff6ade82aa9942cdea6b62d5655d65183c jdk8u151-b00
 4449c73dbfdf2e32889e3ce769bd4160daa48b71 jdk8u151-b01
 ffa099d5b88ff14cea677d2afa4229354e9404d0 jdk8u151-b02
 a6814326f989837019ff7dd0d9b0e57065499bc5 jdk8u151-b03
+cefb3694f8565e1f23ff3231fd21523f52161a95 jdk8u151-b04
 58d0ffe75dc5597310d422e214dc077476bd2338 jdk8u122-b00
 a87b06da783bb5a11f7857220789979129e39e7c jdk8u122-b01
 8684348ae5eb6f895d19e4752dea567642dbcec4 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