Mercurial > hg > openjdk > aarch64-port
changeset 1504:fe115e6573ce
Merge
author | asaha |
---|---|
date | Mon, 16 Mar 2015 12:04:08 -0700 |
parents | 6b2f1bf5c728 (diff) 8b3c10f939d7 (current diff) |
children | 9bdaa6d8d7d0 5a4ccc33ab26 |
files | .hgtags |
diffstat | 2 files changed, 17 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Mar 16 11:48:56 2015 -0700 +++ b/.hgtags Mon Mar 16 12:04:08 2015 -0700 @@ -385,3 +385,16 @@ 12deacac825756e266e91a906db9edab73c4c90b jdk8u40-b27 eee2ebbb97f136cd458d4f3a825ee40d0046f425 jdk8u40-b31 b92f3d486e47d29dfb1ea2096db295077328368e jdk8u40-b32 +ec4bcc6e4dcf190a165106627ed3eef1e7d94d0c jdk8u45-b00 +635ba0c81b894a88ff737fefc9d7af398f761643 jdk8u45-b01 +801c65bb74b770600a2d48189764e416e5cfe265 jdk8u45-b02 +7d11a7eee8c0512fa15d3ed2dcded5391b0c091d jdk8u45-b03 +3d79ef8a102ffe22b083d07649a1d9e22cf784b6 jdk8u45-b04 +45f8fc9d30021026a5101c8946af98f7c079b537 jdk8u45-b05 +9a5843fdd2cf8120515d98572440c5c35118254d jdk8u45-b06 +74ef61db0fe02e3eaa5156a7bab9f00f2a2143de jdk8u45-b07 +0c10bc33556383b8e665998c62145a8398e7f7ef jdk8u45-b08 +733d16eb42cb105749588c9b93cc408155ed99ad jdk8u45-b09 +9a343fd13810a8f09d3dd4a9e2e20791bb866166 jdk8u45-b10 +6738b8755c80905e3eecedf94e27f03d23f02ba9 jdk8u45-b11 +54709b761404dd3bc1b58acf5582fa9bd70ff59a jdk8u45-b12
--- a/THIRD_PARTY_README Mon Mar 16 11:48:56 2015 -0700 +++ b/THIRD_PARTY_README Mon Mar 16 12:04:08 2015 -0700 @@ -1250,7 +1250,7 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to libpng 1.5.4, which may be +%% This notice is provided with respect to libpng 1.6.16, which may be included with JRE 8, JDK 8, and OpenJDK 8. --- begin of LICENSE --- @@ -1266,8 +1266,8 @@ This code is released under the libpng license. -libpng versions 1.2.6, August 15, 2004, through 1.5.4, July 7, 2011, are -Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are +libpng versions 1.2.6, August 15, 2004, through 1.6.16, December 22, 2014, are +Copyright (c) 2004, 2006-2014 Glenn Randers-Pehrson, and are distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors @@ -1364,7 +1364,7 @@ Glenn Randers-Pehrson glennrp at users.sourceforge.net -July 7, 2011 +December 22, 2014 --- end of LICENSE ---