Mercurial > hg > icedtea8-forest > nashorn

changeset 2135:d0a8151a276c jdk8u152-b08

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Mon, 17 Jul 2017 14:13:42 -0700
parents 9ed0fed8ed50 (current diff) 9537bf349d55 (diff)
children 08c6642ea495
files .hgtags
diffstat 2 files changed, 4 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Jul 10 15:55:31 2017 -0700
+++ b/.hgtags	Mon Jul 17 14:13:42 2017 -0700
@@ -688,11 +688,13 @@
 31e8c2a1e8f7637d0f5e5b920b30536eee87d665 jdk8u141-b12
 2c1a74bca789006be1cc7fc642048ade06fef2f2 jdk8u141-b13
 8c329eab0dac3630854a56f2485f9862040bffdf jdk8u141-b14
+dfb2e076f381c4ea8c84ae0309a2072ec3ac92b8 jdk8u141-b15
 6a5473932aff2d9c0df2cdc6e1800dd7c374232f jdk8u151-b00
 681ab42e7c73ba151256f88b7877f5ca4101e63d jdk8u151-b01
 296b5f81b2c28b5d7eea4a7051eae0ec34f5ec05 jdk8u151-b02
 c0828d5abc8646c80236fae42d971477bfc74748 jdk8u151-b03
 a593aff280ac5472a23923604f1a25c8e80e6ec7 jdk8u151-b04
+178207e92304e6717c1b2e80c56424efe4e69204 jdk8u151-b05
 18eb73eb84c5395b3efcafa43ce224565eca02b3 jdk8u122-b00
 9e615ea961fe5732813ed7b273606e7337ea2234 jdk8u122-b01
 2f0b11882cb7ddb10e35682ab9e8343919a71c54 jdk8u122-b02
--- a/THIRD_PARTY_README	Mon Jul 10 15:55:31 2017 -0700
+++ b/THIRD_PARTY_README	Mon Jul 17 14:13:42 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