changeset 3518:355e7c5838b6

Merge
author asaha
date Fri, 14 Jul 2017 14:14:31 -0700
parents 6cb066b4785d e72d5b8a950a
children a732fca2e4c8
files .hgtags THIRD_PARTY_README
diffstat 2 files changed, 7 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Jul 03 16:04:51 2017 -0700
+++ b/.hgtags	Fri Jul 14 14:14:31 2017 -0700
@@ -721,9 +721,14 @@
 b5259d2465fa61256f485860f986bd575f13fe92 jdk8u141-b12
 9a5ddb594b491ec32e9fafa7008631291ab66d6e jdk8u141-b13
 553043f3a2319af6fd6bc704bc8fd7fa4500ee80 jdk8u141-b14
+027f6df9fe82624fb7d489ffd848a26796de4868 jdk8u141-b15
+716e712f0db45c8231208bc70ab4d2a8a40c4d3a jdk8u141-b31
+09c2459991619ef7061ad2bc66373ed29f500acf jdk8u141-b32
 4d69601f88c30e9f05e3b56c6d38a2f3eb47d477 jdk8u151-b00
 f081adae3486f8728affc89213c2cd1dd0ac9467 jdk8u151-b01
 732e1bab2660d21227dce26190d4a31dd9785a7f jdk8u151-b02
+a1d0ecd858bbc397f7683a9e0a3fd1620c327d64 jdk8u151-b03
+d0a51eb7da2995e864af5dc4d010aef0cb3f9e38 jdk8u151-b04
 4d69601f88c30e9f05e3b56c6d38a2f3eb47d477 jdk8u151-b00
 a1d0ecd858bbc397f7683a9e0a3fd1620c327d64 jdk8u151-b03
 9a9ce479b92f1b4d9d436fb857d70c3d2b59a20c jdk8u122-b00
--- a/THIRD_PARTY_README	Mon Jul 03 16:04:51 2017 -0700
+++ b/THIRD_PARTY_README	Fri Jul 14 14:14:31 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