Merge

1264ae72 · asaha · dd49fed0 · ce6848ef · 1264ae72 · 1264ae72
显示空白变更内容
内联并排

Showing with 3 addition and 2 deletion

.hgtags .hgtags +1 -0

THIRD_PARTY_README THIRD_PARTY_README +2 -2

未找到文件。
--- a/.hgtags
+++ b/.hgtags
@@ -984,6 +984,7 @@ e48302d521d59c2fe62f874f1f5d34bc46517da7 jdk8u151-b04
 e1dc36cddcbc36b78e3d0558f87bbf459191e479 jdk8u151-b06
 e2a930243efa63b0a789e85a523e69574d53ac92 jdk8u151-b07
 158904fa31b28f1e027dc5b5a833ee673e89a84b jdk8u151-b08
+8b0169692abbf8fb7972920cd79cee7dcab959c3 jdk8u151-b09
 5aa8c4ca51f0e666d368a4f119ed734d3ac59d7c jdk8u122-b00
 2198ef7e1c1702b3506b95b5d8c886ad5a12bbe5 jdk8u122-b01
 58d961f47dd4ee1d516512b7744e0f1fc83d8f52 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