Fri, 14 Jul 2017 14:12:47 -0700
Merge
.hgtags | file | annotate | diff | comparison | revisions | |
THIRD_PARTY_README | file | annotate | diff | comparison | revisions |
1.1 --- a/.hgtags Tue Jul 11 14:09:46 2017 +0100 1.2 +++ b/.hgtags Fri Jul 14 14:12:47 2017 -0700 1.3 @@ -713,11 +713,15 @@ 1.4 d8134565e6c8cab3ccd0e356c787e0aa75ef68ee jdk8u141-b12 1.5 27d35df45162afdf75b76983fcf11e1cbf2e3001 jdk8u141-b13 1.6 65d3b0e445513e024157635b970660b1e7211937 jdk8u141-b14 1.7 +c62448650df40092f0324e34f35aa9f3940e9928 jdk8u141-b15 1.8 +c5788159081fc767d8c73fefde96bc0ad99eee65 jdk8u141-b31 1.9 +e6c85f5c962a5039101cd045b5251f2e92312a5f jdk8u141-b32 1.10 eb09a34966f43c62cb286c78c10dc722fd12d884 jdk8u151-b00 1.11 c59814f445e808150326012d911b5b4d8caa025b jdk8u151-b01 1.12 d3dec37780f84151b08c03a6a8cba7d68bde0f80 jdk8u151-b02 1.13 32a01bf45f0f32783a5c98e5f68feb9a6e1ffd16 jdk8u161-b00 1.14 4c06ef2757dedeffa5f61acad42c36cbb3496e69 jdk8u151-b03 1.15 +04a80aaab394ef20a3cdfcd04f1498349f691738 jdk8u151-b04 1.16 ea4b3e983ee708f9323d228044176e52526e9e13 jdk8u122-b00 1.17 2e7f62568785adfe695e0c06f2e88c9d369c3b2c jdk8u122-b01 1.18 b97e1b7f3c92b3e9f75e6aa590e0884c3c3ed33f jdk8u122-b02
2.1 --- a/THIRD_PARTY_README Tue Jul 11 14:09:46 2017 +0100 2.2 +++ b/THIRD_PARTY_README Fri Jul 14 14:12:47 2017 -0700 2.3 @@ -2808,12 +2808,12 @@ 2.4 2.5 ------------------------------------------------------------------------------- 2.6 2.7 -%% This notice is provided with respect to zlib v1.2.11, which may be included 2.8 +%% This notice is provided with respect to zlib v1.2.8, which may be included 2.9 with JRE 8, JDK 8, and OpenJDK 8. 2.10 2.11 --- begin of LICENSE --- 2.12 2.13 - version 1.2.11, January 15th, 2017 2.14 + version 1.2.8, April 28th, 2013 2.15 2.16 Copyright (C) 1995-2017 Jean-loup Gailly and Mark Adler 2.17