# HG changeset patch # User asaha # Date 1500008201 25200 # Node ID b1c6368cfc973c00f2ec11e7a93ef0d0f65f6e60 # Parent a40ccf34f82d6ce3776b7c7c49d993a28fda8023# Parent 4c355f7002c36bb626b42d5c1d42ea91d77ba5d6 Merge diff -r a40ccf34f82d -r b1c6368cfc97 .hgtags --- a/.hgtags Mon Jun 26 22:35:49 2017 -0700 +++ b/.hgtags Thu Jul 13 21:56:41 2017 -0700 @@ -709,6 +709,7 @@ b5259d2465fa61256f485860f986bd575f13fe92 jdk8u141-b12 9a5ddb594b491ec32e9fafa7008631291ab66d6e jdk8u141-b13 553043f3a2319af6fd6bc704bc8fd7fa4500ee80 jdk8u141-b14 +027f6df9fe82624fb7d489ffd848a26796de4868 jdk8u141-b15 9a9ce479b92f1b4d9d436fb857d70c3d2b59a20c jdk8u122-b00 85d9e434701cc7112aaf965b0f5ee4b31ab2a445 jdk8u122-b01 2baeb96fa198f75e9bd50a5f5ef4a19be6cfbc4e jdk8u122-b02 diff -r a40ccf34f82d -r b1c6368cfc97 THIRD_PARTY_README --- a/THIRD_PARTY_README Mon Jun 26 22:35:49 2017 -0700 +++ b/THIRD_PARTY_README Thu Jul 13 21:56:41 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