# HG changeset patch # User asaha # Date 1502829921 25200 # Node ID b83ee184e012c5a4eb8989f55216d186d9f5aaaa # Parent 680c861c12c468deec4213892235f9d5775281be# Parent 8fb1d9ffc81c4bb6e08330726995b9b8f2b694a1 Merge diff -r 680c861c12c4 -r b83ee184e012 .hgtags --- a/.hgtags Tue Aug 08 10:06:42 2017 -0700 +++ b/.hgtags Tue Aug 15 13:45:21 2017 -0700 @@ -721,6 +721,7 @@ ff824edbfa4dc81b6f2b5c33e4027806fd149304 jdk8u151-b06 305472b39e966569e99a8b149543e3cd9160419c jdk8u151-b07 bb3202444c4b86a63aaf68490f09ecf4bb1eff5f jdk8u151-b08 +c686a7fe765ec746c514618bae61dfc1570ce5b5 jdk8u151-b09 9a9ce479b92f1b4d9d436fb857d70c3d2b59a20c jdk8u122-b00 85d9e434701cc7112aaf965b0f5ee4b31ab2a445 jdk8u122-b01 2baeb96fa198f75e9bd50a5f5ef4a19be6cfbc4e jdk8u122-b02 diff -r 680c861c12c4 -r b83ee184e012 THIRD_PARTY_README --- a/THIRD_PARTY_README Tue Aug 08 10:06:42 2017 -0700 +++ b/THIRD_PARTY_README Tue Aug 15 13:45:21 2017 -0700 @@ -2808,12 +2808,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-2017 Jean-loup Gailly and Mark Adler