Thu, 13 Jul 2017 21:47:40 -0700
Merge
.hgtags | file | annotate | diff | comparison | revisions |
1.1 --- a/.hgtags Mon Jun 26 22:32:46 2017 -0700 1.2 +++ b/.hgtags Thu Jul 13 21:47:40 2017 -0700 1.3 @@ -972,6 +972,7 @@ 1.4 d6e7c7d2c6f69906b4cb643a6813eccba0de988f jdk8u141-b12 1.5 df6af363337eff5b22ae7940b0981231fdf5dfb4 jdk8u141-b13 1.6 3a1543e089c32592be9c201c6e021295fbf5fdc1 jdk8u141-b14 1.7 +23f1790147d838ddb1133cc79dc08e7c9ba5ab44 jdk8u141-b15 1.8 5aa8c4ca51f0e666d368a4f119ed734d3ac59d7c jdk8u122-b00 1.9 2198ef7e1c1702b3506b95b5d8c886ad5a12bbe5 jdk8u122-b01 1.10 58d961f47dd4ee1d516512b7744e0f1fc83d8f52 jdk8u122-b02
2.1 --- a/THIRD_PARTY_README Mon Jun 26 22:32:46 2017 -0700 2.2 +++ b/THIRD_PARTY_README Thu Jul 13 21:47:40 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