Fri, 28 Apr 2017 14:06:30 -0700
Merge
.hgtags | file | annotate | diff | comparison | revisions |
1.1 --- a/.hgtags Tue Mar 21 13:41:34 2017 -0700 1.2 +++ b/.hgtags Fri Apr 28 14:06:30 2017 -0700 1.3 @@ -704,3 +704,8 @@ 1.4 5162417b51bdf68b95696198181f2e662a14ff8a jdk8u131-b11 1.5 1175fac90fdbbd864f7b1f306397644d26eb9781 jdk8u141-b00 1.6 bb163efa3276e129c69bad28299a6283b869caa3 jdk8u141-b01 1.7 +5864e3781953daa69efd54b329a358a568229268 jdk8u141-b02 1.8 +4378c8e874a5c13409b651a47b4b388f17904da1 jdk8u141-b03 1.9 +d89ea3127a93d7ea6f2b89ee3adc673136833933 jdk8u141-b04 1.10 +b8e0348df792b1c5f95cd7d77d5c05da1d435d32 jdk8u141-b05 1.11 +13b638c8e005d48be437db11835a63721ca10086 jdk8u141-b06
2.1 --- a/THIRD_PARTY_README Tue Mar 21 13:41:34 2017 -0700 2.2 +++ b/THIRD_PARTY_README Fri Apr 28 14:06:30 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