Merge

1dc9febf · asaha · b6b4f480 · d4a67867 · 1dc9febf · 1dc9febf
隐藏空白更改
内联并排

Showing with 7 addition and 2 deletion

.hgtags .hgtags +5 -0

THIRD_PARTY_README THIRD_PARTY_README +2 -2

未找到文件。
--- a/.hgtags
+++ b/.hgtags
@@ -702,3 +702,8 @@ f2b5b6ab1f5544b92074adb5bb80cc031649d0e7 jdk8u121-b13
 94b1198760284f6b53daa4c3361261a0a5207150 jdk8u131-b11
 756ee32cd629989dfe63c5e11dfcf2d3598543f0 jdk8u141-b00
 b174b1474d36381dadb65391ba67f8e44d14e2f6 jdk8u141-b01
+3036128430bcd058d81fe4b5bf18dc7beabd6449 jdk8u141-b02
+68b47161333dea25ec15a302eb22749a85b07c55 jdk8u141-b03
+571e02a10797c3d291054eca55ebc53bd12e3994 jdk8u141-b04
+5346ed81542f2907b6d740ee22c8f1671c9d434a jdk8u141-b05
+a4df4fcf824df487488cf2c6e8e8236116f4723f jdk8u141-b06
--- a/THIRD_PARTY_README
+++ b/THIRD_PARTY_README
@@ -3318,12 +3318,12 @@ info@urwpp.de or design@bigelowandholmes.com

 -------------------------------------------------------------------------------

-%% 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-2013 Jean-loup Gailly and Mark Adler