Fri, 28 Apr 2017 14:03:03 -0700
Merge
.hgtags | file | annotate | diff | comparison | revisions |
1.1 --- a/.hgtags Tue Mar 21 12:35:59 2017 -0700 1.2 +++ b/.hgtags Fri Apr 28 14:03:03 2017 -0700 1.3 @@ -737,3 +737,8 @@ 1.4 2b88cb53e31fb637d7c37cc3414bb3eb3e9d1f0d jdk8u131-b11 1.5 7056e474d6e3b7b3bac76bc35f8c4c321bf9abe9 jdk8u141-b00 1.6 0f825574a7c8742494810d1f29193bfc3f1d370c jdk8u141-b01 1.7 +66d2dbe82668e425317ec0c421f5384399b220c9 jdk8u141-b02 1.8 +7316b3f30654a029024aab9f36ab814b44138e9d jdk8u141-b03 1.9 +68139c8638dc8038d3b5a3fcb41e4e314a95df1f jdk8u141-b04 1.10 +df048aacfa198bbfba66dae289dd0287627f5576 jdk8u141-b05 1.11 +608c9620655e56d96f741a68c214406740e48909 jdk8u141-b06
2.1 --- a/THIRD_PARTY_README Tue Mar 21 12:35:59 2017 -0700 2.2 +++ b/THIRD_PARTY_README Fri Apr 28 14:03:03 2017 -0700 2.3 @@ -3318,12 +3318,12 @@ 2.4 2.5 ------------------------------------------------------------------------------- 2.6 2.7 -%% This notice is provided with respect to zlib v1.2.8, which may be included 2.8 +%% This notice is provided with respect to zlib v1.2.11, which may be included 2.9 with JRE 8, JDK 8, and OpenJDK 8. 2.10 2.11 --- begin of LICENSE --- 2.12 2.13 - version 1.2.8, April 28th, 2013 2.14 + version 1.2.11, January 15th, 2017 2.15 2.16 Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler 2.17