changeset 2070:eb577ed6ec93 icedtea-3.6.0

Merge jdk8u151-b12
author andrew
date Mon, 30 Oct 2017 17:28:35 +0000
parents f2b76f62914e (current diff) 27cf3b167362 (diff)
children 52a299828e97
files .hgtags common/autoconf/generated-configure.sh
diffstat 3 files changed, 16 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Oct 30 14:54:00 2017 +0000
+++ b/.hgtags	Mon Oct 30 17:28:35 2017 +0000
@@ -744,3 +744,16 @@
 ee1282876d8a593d8a0edd813f77b4b9552821b8 icedtea-3.6.0pre00
 80ab5dd98579910a24f13cae0a4c7e4092ed3557 icedtea-3.6.0pre01
 63060ee6ba74f271059e59348c865c5991d856d3 icedtea-3.6.0pre02
+57a5aae91b8bdccc4e1910cf373f13598429f03e jdk8u144-b01
+b85ec4e74ab5149adb30d993afbd517bd3df2a51 jdk8u151-b00
+0504d5c1c32696240cd1973bc79ab0dfcc59ee85 jdk8u151-b01
+9408ef2c7b205185aa5f9079fc44424328c64156 jdk8u151-b02
+66a82078ad5463ff048ec7b21405da3b5f62214a jdk8u151-b03
+6e00c7da6a32c0f750ccfbe4c71204eeb6cccc14 jdk8u151-b04
+6d4ab2046f26035e500924bffb49934d66aa64e3 jdk8u151-b05
+2edf82f6996ed27adb82dec2e3ce880134a98cc6 jdk8u151-b06
+9f271942852d8bc7de6c282307ffec3c92518f7d jdk8u151-b07
+1be5e74bfdf0c42ef5746b63b39a8ac139a063f7 jdk8u151-b08
+dd863a7bde3f0a335b99c9205af84a404fc55488 jdk8u151-b09
+af89399e4d1190c42e23b95da79800da51b40808 jdk8u151-b10
+ace131d990fdb75a6616f18265b2c4ecca2e3f5d jdk8u151-b11
--- a/THIRD_PARTY_README	Mon Oct 30 14:54:00 2017 +0000
+++ b/THIRD_PARTY_README	Mon Oct 30 17:28:35 2017 +0000
@@ -2808,12 +2808,12 @@
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to zlib v1.2.8, which may be included 
+%% This notice is provided with respect to zlib v1.2.11, which may be included 
 with JRE 8, JDK 8, and OpenJDK 8.
 
 --- begin of LICENSE ---
 
-  version 1.2.8, April 28th, 2013
+  version 1.2.11, January 15th, 2017
 
   Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler
 
--- a/common/autoconf/generated-configure.sh	Mon Oct 30 14:54:00 2017 +0000
+++ b/common/autoconf/generated-configure.sh	Mon Oct 30 17:28:35 2017 +0000
@@ -3999,7 +3999,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1494954918
+DATE_WHEN_GENERATED=1500922661
 
 ###############################################################################
 #