Mercurial > hg > openjdk > aarch64-port > corba
changeset 944:b992de359883
Merge
author | asaha |
---|---|
date | Tue, 17 Mar 2015 11:59:33 -0700 |
parents | b5df9eeb5c17 (current diff) 50fb9bed64c9 (diff) |
children | 92d66ee83ee0 |
files | .hgtags |
diffstat | 2 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Feb 26 10:31:24 2015 -0800 +++ b/.hgtags Tue Mar 17 11:59:33 2015 -0700 @@ -378,6 +378,8 @@ 62f7faef5ed956cd481cae6216b22fdb4b6e3e46 jdk8u40-b23 472aa5bae0e78614e873d56bcc31e7caba49963c jdk8u40-b24 2220744100b8487976debff79e5d0c7d70738bda jdk8u40-b25 +cab2b99c6bb2e15165a58eaa36157788f82592f1 jdk8u40-b26 +bd0186cd2419129357b110fe3f13519f68b29774 jdk8u40-b27 5761efbc739fdedcbff224e22f920e88b29af4cf jdk8u45-b00 6a52852476c9ccb2d52153d1b94b675e863bb28c jdk8u45-b01 3b9d342f9f584465ea5976e06357b45682f9681d jdk8u45-b02 @@ -388,6 +390,10 @@ 4dec7b828f1ee3adbf3c2b6430400db8b1abb5ad jdk8u45-b07 16cb989c8b6220330a54fe78ae27b2f50fc5e794 jdk8u45-b08 ace36a054b7faadb702d6f23e569efb77f0a7513 jdk8u45-b09 +b9ef43c59b425961526b04e92d7fa66014ec25eb jdk8u45-b10 +08c2ce4b6d59bc6b29e61fd8562b9e3d39b257a5 jdk8u45-b11 +c9bf2543c0c045ef31f0296bc355381e1a4bd4ac jdk8u45-b12 +326f02235e7a9a6da78428410320dcc980827d40 jdk8u45-b13 8bbc2bb414b7e9331c2014c230553d72c9d161c5 jdk8u60-b00 15ae8298b34beb30f2bd7baa7ff895af2bec13f6 jdk8u60-b01 a98524c04cbd24bbc3029b21c033abf9108e92b4 jdk8u60-b02
--- a/THIRD_PARTY_README Thu Feb 26 10:31:24 2015 -0800 +++ b/THIRD_PARTY_README Tue Mar 17 11:59:33 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 ---