changeset 24393:285fcd09ae99 jdk8u152-b08

Merge
author asaha
date Mon, 17 Jul 2017 13:58:14 -0700
parents 60354beed080 203e6e89c188
children b1d0d7ec133f
files .hgtags
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Jul 10 15:54:04 2017 -0700
+++ b/.hgtags	Mon Jul 17 13:58:14 2017 -0700
@@ -972,11 +972,13 @@
 d6e7c7d2c6f69906b4cb643a6813eccba0de988f jdk8u141-b12
 df6af363337eff5b22ae7940b0981231fdf5dfb4 jdk8u141-b13
 3a1543e089c32592be9c201c6e021295fbf5fdc1 jdk8u141-b14
+23f1790147d838ddb1133cc79dc08e7c9ba5ab44 jdk8u141-b15
 2d5100bddeb80cf767485b787fc3051311e3d7b9 jdk8u151-b00
 596b584c68b73ec635347807571463580deb955f jdk8u151-b01
 1f6f436360d5cd375b806aec1c78abb8fcb4e5f6 jdk8u151-b02
 0aaeb48ae39e4fc558caf1b0c7ee504a49fec441 jdk8u151-b03
 e48302d521d59c2fe62f874f1f5d34bc46517da7 jdk8u151-b04
+507af6ef977a5d0306a8723dec66e34befc1ae81 jdk8u151-b05
 5aa8c4ca51f0e666d368a4f119ed734d3ac59d7c jdk8u122-b00
 2198ef7e1c1702b3506b95b5d8c886ad5a12bbe5 jdk8u122-b01
 58d961f47dd4ee1d516512b7744e0f1fc83d8f52 jdk8u122-b02
--- a/THIRD_PARTY_README	Mon Jul 10 15:54:04 2017 -0700
+++ b/THIRD_PARTY_README	Mon Jul 17 13:58:14 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