Merge

5a8bbeea · asaha · 73a6c7b3 · b13c7ee9 · 5a8bbeea · 5a8bbeea
隐藏空白更改
内联并排

Showing with 3 addition and 2 deletion

.hgtags .hgtags +1 -0

THIRD_PARTY_README THIRD_PARTY_README +2 -2

未找到文件。
--- a/.hgtags
+++ b/.hgtags
@@ -707,6 +707,7 @@ a4df4fcf824df487488cf2c6e8e8236116f4723f jdk8u141-b06
 96264dd0d57d3d4bc6b66678f44b62eb2776bdcc jdk8u141-b12
 1d97fc4da695a5ada6fe0174ab45e5ea8b9cd9d8 jdk8u141-b13
 68a5871a5dd3ca652cf4623b686aacbb1da0a93b jdk8u141-b14
+48a5a43b31970468f4fc0dc67b81e4ddeac1585f jdk8u141-b15
 b85ec4e74ab5149adb30d993afbd517bd3df2a51 jdk8u151-b00
 0504d5c1c32696240cd1973bc79ab0dfcc59ee85 jdk8u151-b01
 9408ef2c7b205185aa5f9079fc44424328c64156 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