Mercurial > hg > openjdk > jdk8u > jaxws
changeset 1494:e6c85f5c962a jdk8u141-b32
Merge
author | asaha |
---|---|
date | Thu, 13 Jul 2017 08:54:06 -0700 |
parents | 60c9c1e269dc (current diff) c57e086660a3 (diff) |
children | 685c4e3bfe4d |
files | .hgtags |
diffstat | 2 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Jul 06 22:00:21 2017 -0700 +++ b/.hgtags Thu Jul 13 08:54:06 2017 -0700 @@ -713,4 +713,5 @@ d8134565e6c8cab3ccd0e356c787e0aa75ef68ee jdk8u141-b12 27d35df45162afdf75b76983fcf11e1cbf2e3001 jdk8u141-b13 65d3b0e445513e024157635b970660b1e7211937 jdk8u141-b14 +c62448650df40092f0324e34f35aa9f3940e9928 jdk8u141-b15 c5788159081fc767d8c73fefde96bc0ad99eee65 jdk8u141-b31
--- a/THIRD_PARTY_README Thu Jul 06 22:00:21 2017 -0700 +++ b/THIRD_PARTY_README Thu Jul 13 08:54:06 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