Merge

ad978c01 · asaha · 8385565f · 11369792 · ad978c01 · ad978c01
隐藏空白更改
内联并排

Showing with 3 addition and 2 deletion

.hgtags .hgtags +1 -0

THIRD_PARTY_README THIRD_PARTY_README +2 -2

未找到文件。
--- a/.hgtags
+++ b/.hgtags
@@ -754,6 +754,7 @@ cefb3694f8565e1f23ff3231fd21523f52161a95 jdk8u151-b04
 3289ad7e88f3aa38fdaa4910e9eeed5e1e5430b1 jdk8u151-b06
 d41040488bbb511d64c6c2533d642e52675edfde jdk8u151-b07
 5d079476bf24cb8143473d2a0880e0b2e032b1eb jdk8u151-b08
+c5f095a1df38d9be119adcab5bbd7e4365e21871 jdk8u151-b09
 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.8, which may be included 
+%% This notice is provided with respect to zlib v1.2.11, which may be included 
 with JRE 8, JDK 8, and OpenJDK 8.

 --- begin of LICENSE ---

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

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