# HG changeset patch # User asaha # Date 1500325987 25200 # Node ID 19eec1de09c1fef1392593284eb9d2c5becd6663 # Parent 4337c0d15fc8f018a34aa609adafa389228e6bd3# Parent df99c5186abe7bbedcb691412bd61c1efbf8df99 Merge diff -r 4337c0d15fc8 -r 19eec1de09c1 .hgtags --- a/.hgtags Mon Jul 10 15:55:24 2017 -0700 +++ b/.hgtags Mon Jul 17 14:13:07 2017 -0700 @@ -709,11 +709,13 @@ b5259d2465fa61256f485860f986bd575f13fe92 jdk8u141-b12 9a5ddb594b491ec32e9fafa7008631291ab66d6e jdk8u141-b13 553043f3a2319af6fd6bc704bc8fd7fa4500ee80 jdk8u141-b14 +027f6df9fe82624fb7d489ffd848a26796de4868 jdk8u141-b15 4d69601f88c30e9f05e3b56c6d38a2f3eb47d477 jdk8u151-b00 f081adae3486f8728affc89213c2cd1dd0ac9467 jdk8u151-b01 732e1bab2660d21227dce26190d4a31dd9785a7f jdk8u151-b02 a1d0ecd858bbc397f7683a9e0a3fd1620c327d64 jdk8u151-b03 d0a51eb7da2995e864af5dc4d010aef0cb3f9e38 jdk8u151-b04 +e0ed0609963aca47e766901d7ec57ab97b649567 jdk8u151-b05 9a9ce479b92f1b4d9d436fb857d70c3d2b59a20c jdk8u122-b00 85d9e434701cc7112aaf965b0f5ee4b31ab2a445 jdk8u122-b01 2baeb96fa198f75e9bd50a5f5ef4a19be6cfbc4e jdk8u122-b02 diff -r 4337c0d15fc8 -r 19eec1de09c1 THIRD_PARTY_README --- a/THIRD_PARTY_README Mon Jul 10 15:55:24 2017 -0700 +++ b/THIRD_PARTY_README Mon Jul 17 14:13:07 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