# HG changeset patch # User asaha # Date 1493413590 25200 # Node ID 55f694d22dfe6f490ec957cdac44fa24a14927da # Parent 27131d3a9851893533d91b61bd322199532bf332# Parent 4d04a70e3207dcb46b71e6f9ad04bf0e130cf389 Merge diff -r 27131d3a9851 -r 55f694d22dfe .hgtags --- a/.hgtags Tue Mar 21 13:41:34 2017 -0700 +++ b/.hgtags Fri Apr 28 14:06:30 2017 -0700 @@ -704,3 +704,8 @@ 5162417b51bdf68b95696198181f2e662a14ff8a jdk8u131-b11 1175fac90fdbbd864f7b1f306397644d26eb9781 jdk8u141-b00 bb163efa3276e129c69bad28299a6283b869caa3 jdk8u141-b01 +5864e3781953daa69efd54b329a358a568229268 jdk8u141-b02 +4378c8e874a5c13409b651a47b4b388f17904da1 jdk8u141-b03 +d89ea3127a93d7ea6f2b89ee3adc673136833933 jdk8u141-b04 +b8e0348df792b1c5f95cd7d77d5c05da1d435d32 jdk8u141-b05 +13b638c8e005d48be437db11835a63721ca10086 jdk8u141-b06 diff -r 27131d3a9851 -r 55f694d22dfe THIRD_PARTY_README --- a/THIRD_PARTY_README Tue Mar 21 13:41:34 2017 -0700 +++ b/THIRD_PARTY_README Fri Apr 28 14:06:30 2017 -0700 @@ -3318,12 +3318,12 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to zlib v1.2.8, which may be included +%% This notice is provided with respect to zlib v1.2.11, which may be included with JRE 8, JDK 8, and OpenJDK 8. --- begin of LICENSE --- - version 1.2.8, April 28th, 2013 + version 1.2.11, January 15th, 2017 Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler