# HG changeset patch # User asaha # Date 1500007849 25200 # Node ID cc36cc5570a898574e8c389339cf00356bb6106e # Parent 417a8416b2a630a081a4182daccb3c16bd923ab2# Parent c57e086660a37470793e38b94d7abedb79489ce3 Merge diff -r 417a8416b2a6 -r cc36cc5570a8 .hgtags --- a/.hgtags Mon Jun 26 22:34:01 2017 -0700 +++ b/.hgtags Thu Jul 13 21:50:49 2017 -0700 @@ -701,6 +701,7 @@ d8134565e6c8cab3ccd0e356c787e0aa75ef68ee jdk8u141-b12 27d35df45162afdf75b76983fcf11e1cbf2e3001 jdk8u141-b13 65d3b0e445513e024157635b970660b1e7211937 jdk8u141-b14 +c62448650df40092f0324e34f35aa9f3940e9928 jdk8u141-b15 ea4b3e983ee708f9323d228044176e52526e9e13 jdk8u122-b00 2e7f62568785adfe695e0c06f2e88c9d369c3b2c jdk8u122-b01 b97e1b7f3c92b3e9f75e6aa590e0884c3c3ed33f jdk8u122-b02 diff -r 417a8416b2a6 -r cc36cc5570a8 THIRD_PARTY_README --- a/THIRD_PARTY_README Mon Jun 26 22:34:01 2017 -0700 +++ b/THIRD_PARTY_README Thu Jul 13 21:50:49 2017 -0700 @@ -2808,12 +2808,12 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to zlib v1.2.11, which may be included +%% This notice is provided with respect to zlib v1.2.8, which may be included with JRE 8, JDK 8, and OpenJDK 8. --- begin of LICENSE --- - version 1.2.11, January 15th, 2017 + version 1.2.8, April 28th, 2013 Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler