Thu, 13 Jul 2017 08:57:55 -0700
Merge
.hgtags | file | annotate | diff | comparison | revisions |
1.1 --- a/.hgtags Thu Jul 06 22:01:12 2017 -0700 1.2 +++ b/.hgtags Thu Jul 13 08:57:55 2017 -0700 1.3 @@ -700,4 +700,5 @@ 1.4 31e8c2a1e8f7637d0f5e5b920b30536eee87d665 jdk8u141-b12 1.5 2c1a74bca789006be1cc7fc642048ade06fef2f2 jdk8u141-b13 1.6 8c329eab0dac3630854a56f2485f9862040bffdf jdk8u141-b14 1.7 +dfb2e076f381c4ea8c84ae0309a2072ec3ac92b8 jdk8u141-b15 1.8 6f50b0c7c275324f76cf7f09606949195fd65f92 jdk8u141-b31
2.1 --- a/THIRD_PARTY_README Thu Jul 06 22:01:12 2017 -0700 2.2 +++ b/THIRD_PARTY_README Thu Jul 13 08:57:55 2017 -0700 2.3 @@ -2808,12 +2808,12 @@ 2.4 2.5 ------------------------------------------------------------------------------- 2.6 2.7 -%% This notice is provided with respect to zlib v1.2.11, which may be included 2.8 +%% This notice is provided with respect to zlib v1.2.8, 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.11, January 15th, 2017 2.14 + version 1.2.8, April 28th, 2013 2.15 2.16 Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler 2.17