Thu, 13 Jul 2017 21:46:45 -0700
Merge
.hgtags | file | annotate | diff | comparison | revisions |
1.1 --- a/.hgtags Mon Jun 26 22:32:15 2017 -0700 1.2 +++ b/.hgtags Thu Jul 13 21:46:45 2017 -0700 1.3 @@ -742,6 +742,7 @@ 1.4 87a9107675a5a508d99a00f872f01e5bb42cfc02 jdk8u141-b12 1.5 ad04b672d6f92dcfbe9e72de041bd05d26a31fde jdk8u141-b13 1.6 2232cdb74345eeeeffc13d4f6b1cbcae068c5998 jdk8u141-b14 1.7 +4f242f33e89a7900f2fcdcd9402058b6d01f340c jdk8u141-b15 1.8 58d0ffe75dc5597310d422e214dc077476bd2338 jdk8u122-b00 1.9 a87b06da783bb5a11f7857220789979129e39e7c jdk8u122-b01 1.10 8684348ae5eb6f895d19e4752dea567642dbcec4 jdk8u122-b02
2.1 --- a/THIRD_PARTY_README Mon Jun 26 22:32:15 2017 -0700 2.2 +++ b/THIRD_PARTY_README Thu Jul 13 21:46:45 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