Tue, 17 Mar 2015 11:59:08 -0700
Merge
.hgtags | file | annotate | diff | comparison | revisions |
1.1 --- a/.hgtags Thu Feb 26 10:30:32 2015 -0800 1.2 +++ b/.hgtags Tue Mar 17 11:59:08 2015 -0700 1.3 @@ -380,6 +380,8 @@ 1.4 5dd2ad6c7911a1e21f15a28f13ffad662378a3be jdk8u40-b23 1.5 5b37e6757d7c95c9c58b07fb3c9eba234567385a jdk8u40-b24 1.6 e26f15704e37f28acebb22378c4785891aaec637 jdk8u40-b25 1.7 +7a552439756eaad0618ae82a94c034edb65f5d7e jdk8u40-b26 1.8 +12deacac825756e266e91a906db9edab73c4c90b jdk8u40-b27 1.9 ec4bcc6e4dcf190a165106627ed3eef1e7d94d0c jdk8u45-b00 1.10 635ba0c81b894a88ff737fefc9d7af398f761643 jdk8u45-b01 1.11 801c65bb74b770600a2d48189764e416e5cfe265 jdk8u45-b02 1.12 @@ -390,6 +392,10 @@ 1.13 74ef61db0fe02e3eaa5156a7bab9f00f2a2143de jdk8u45-b07 1.14 0c10bc33556383b8e665998c62145a8398e7f7ef jdk8u45-b08 1.15 733d16eb42cb105749588c9b93cc408155ed99ad jdk8u45-b09 1.16 +9a343fd13810a8f09d3dd4a9e2e20791bb866166 jdk8u45-b10 1.17 +6738b8755c80905e3eecedf94e27f03d23f02ba9 jdk8u45-b11 1.18 +54709b761404dd3bc1b58acf5582fa9bd70ff59a jdk8u45-b12 1.19 +6b2f1bf5c72873d01b37103fc20ac7a63e7881dd jdk8u45-b13 1.20 ae4980d195b64eec58884b233d7efd312205bac8 jdk8u60-b00 1.21 acf81f6fb265c1564b16fd8202a324a9022e204b jdk8u60-b01 1.22 2ca2e2430370d441cbe7999b76b57cadf0060327 jdk8u60-b02
2.1 --- a/THIRD_PARTY_README Thu Feb 26 10:30:32 2015 -0800 2.2 +++ b/THIRD_PARTY_README Tue Mar 17 11:59:08 2015 -0700 2.3 @@ -1250,7 +1250,7 @@ 2.4 2.5 ------------------------------------------------------------------------------- 2.6 2.7 -%% This notice is provided with respect to libpng 1.5.4, which may be 2.8 +%% This notice is provided with respect to libpng 1.6.16, which may be 2.9 included with JRE 8, JDK 8, and OpenJDK 8. 2.10 2.11 --- begin of LICENSE --- 2.12 @@ -1266,8 +1266,8 @@ 2.13 2.14 This code is released under the libpng license. 2.15 2.16 -libpng versions 1.2.6, August 15, 2004, through 1.5.4, July 7, 2011, are 2.17 -Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are 2.18 +libpng versions 1.2.6, August 15, 2004, through 1.6.16, December 22, 2014, are 2.19 +Copyright (c) 2004, 2006-2014 Glenn Randers-Pehrson, and are 2.20 distributed according to the same disclaimer and license as libpng-1.2.5 2.21 with the following individual added to the list of Contributing Authors 2.22 2.23 @@ -1364,7 +1364,7 @@ 2.24 2.25 Glenn Randers-Pehrson 2.26 glennrp at users.sourceforge.net 2.27 -July 7, 2011 2.28 +December 22, 2014 2.29 2.30 --- end of LICENSE --- 2.31