Merge

941cc2ec · asaha · a7f8739c · 63aaa031 · 941cc2ec · 941cc2ec
隐藏空白更改
内联并排

Showing with 7 addition and 2 deletion

.hgtags .hgtags +5 -0

THIRD_PARTY_README THIRD_PARTY_README +2 -2

未找到文件。
--- a/.hgtags
+++ b/.hgtags
@@ -737,3 +737,8 @@ de3c63a8b2e52d47554c999a65dbcec7f6d9c1be jdk8u131-b10
 2b88cb53e31fb637d7c37cc3414bb3eb3e9d1f0d jdk8u131-b11
 7056e474d6e3b7b3bac76bc35f8c4c321bf9abe9 jdk8u141-b00
 0f825574a7c8742494810d1f29193bfc3f1d370c jdk8u141-b01
+66d2dbe82668e425317ec0c421f5384399b220c9 jdk8u141-b02
+7316b3f30654a029024aab9f36ab814b44138e9d jdk8u141-b03
+68139c8638dc8038d3b5a3fcb41e4e314a95df1f jdk8u141-b04
+df048aacfa198bbfba66dae289dd0287627f5576 jdk8u141-b05
+608c9620655e56d96f741a68c214406740e48909 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