Merge

e871cace · asaha · 237f5bd7 · 4da1ddbe · e871cace · e871cace
隐藏空白更改
内联并排

Showing with 3 addition and 2 deletion

.hgtags .hgtags +1 -0

THIRD_PARTY_README THIRD_PARTY_README +2 -2

未找到文件。
--- a/.hgtags
+++ b/.hgtags
@@ -972,6 +972,7 @@ de803a292be4add77fd8a1e034481f0692c89f95 jdk8u141-b11
 d6e7c7d2c6f69906b4cb643a6813eccba0de988f jdk8u141-b12
 df6af363337eff5b22ae7940b0981231fdf5dfb4 jdk8u141-b13
 3a1543e089c32592be9c201c6e021295fbf5fdc1 jdk8u141-b14
+23f1790147d838ddb1133cc79dc08e7c9ba5ab44 jdk8u141-b15
 2d5100bddeb80cf767485b787fc3051311e3d7b9 jdk8u151-b00
 596b584c68b73ec635347807571463580deb955f jdk8u151-b01
 1f6f436360d5cd375b806aec1c78abb8fcb4e5f6 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