changeset 1681:ce9dcdef6f40

Merge
author asaha
date Fri, 14 Jul 2017 11:58:34 -0700
parents 2d2d15790969 e32b177d6ff4
children 1fe884a5ea20
files .hgtags THIRD_PARTY_README
diffstat 2 files changed, 6 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Jul 10 13:49:57 2017 +0100
+++ b/.hgtags	Fri Jul 14 11:58:34 2017 -0700
@@ -724,10 +724,14 @@
 790fea8778f49a14e461ef9897109395d7b8ae30 jdk8u141-b12
 5c33c65a916e02794d3d0c82648bbb8138e20023 jdk8u141-b13
 a907feb04fc1f737117deb331dabb32eb5d68f43 jdk8u141-b14
+5790500308c0e7c2e7f1068c5ff5c76c1d54497d jdk8u141-b15
+e2652eebd4bd5bcf42c3b7f63720e62af02d306e jdk8u141-b31
+e1412055ece943882d764224addb0eddd5f703b9 jdk8u141-b32
 7dfdf274dbb6c944e09faf2334312821dade36d3 jdk8u151-b00
 2ab7976c6978b24f70a9f703db964e7e08f9c5ef jdk8u151-b01
 7dc4280622febe9a8dee40850d6f848c14dfac82 jdk8u151-b02
 c88f8b48f916a354bda6186f7cc3ba6cda0c3942 jdk8u151-b03
+b093ba0cc1da2bde9d3f1b47057c0002928e6121 jdk8u151-b04
 2e5a470691f23ebf8d1f0f0dea8ef7de9a70a943 jdk8u122-b00
 cbb8efe139275a4e7c541f9e45eb410c27a5ea61 jdk8u122-b01
 e279f24557d43d8edfe313cb1a53add7ac6ceb2c jdk8u122-b02
--- a/THIRD_PARTY_README	Mon Jul 10 13:49:57 2017 +0100
+++ b/THIRD_PARTY_README	Fri Jul 14 11:58:34 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