Mercurial > hg > openjdk > icedtea > jdk7 > corba
changeset 402:254ee36d115a
Merge
author | asaha |
---|---|
date | Fri, 18 Nov 2011 12:37:34 -0800 |
parents | bded7b26cda6 (current diff) 62b846b0c325 (diff) |
children | 1b648adeeefa |
files | |
diffstat | 2 files changed, 18 insertions(+), 13 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Wed Nov 02 15:18:02 2011 -0700 +++ b/.hgtags Fri Nov 18 12:37:34 2011 -0800 @@ -138,3 +138,5 @@ 59c003227deb9dca331c590126abd25f5feed78b jdk7u1-b07 49aecdae2fba1730b5eda4f249e194881f2ffa63 jdk7u1-b08 82330ae1ba8b29384644db0e3385cab88aae59c2 jdk7u2-b11 +56b02f8ef70391a67c9fa71157a8faafbdff4b74 jdk7u2-b12 +456ff1f14b14ef8cfe47cef95c8094f8443fa092 jdk7u2-b13
--- a/THIRD_PARTY_README Wed Nov 02 15:18:02 2011 -0700 +++ b/THIRD_PARTY_README Fri Nov 18 12:37:34 2011 -0800 @@ -216,15 +216,16 @@ is included with JRE 7, JDK 7, and OpenJDK 7. You are receiving a copy of the Elliptic Curve Cryptography library in source -form with the JDK 7 source distribution and object code in the JRE 7 & JDK 7 -runtime. - -The terms of the Oracle license do NOT apply to the Elliptic Curve -Cryptography library program; it is licensed under the following license, -separately from the Oracle programs you receive. If you do not wish to install -this program, you may delete the library named libsunec.so (on Solaris and -Linux systems) or sunec.dll (on Windows systems) from the JRE bin directory -reserved for native libraries. +form with the JDK 7 and OpenJDK7 source distributions, and as object code in +the JRE 7 & JDK 7 runtimes. + +In the case of the JRE 7 & JDK 7 runtimes, the terms of the Oracle license do +NOT apply to the Elliptic Curve Cryptography library; it is licensed under the +following license, separately from Oracle's JDK & JRE. If you do not wish to +install the Elliptic Curve Cryptography library, you may delete the library +named libsunec.so (on Solaris and Linux systems) or sunec.dll (on Windows +systems) from the JRE bin directory reserved for native libraries. + --- begin of LICENSE --- @@ -1000,7 +1001,7 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to libpng 1.2.18, which is +%% This notice is provided with respect to libpng 1.5.4, which is included with JRE 7, JDK 7, and OpenJDK 7. --- begin of LICENSE --- @@ -1014,8 +1015,10 @@ If you modify libpng you may insert additional notices immediately following this sentence. -libpng versions 1.2.6, August 15, 2004, through 1.2.18, May 15, 2007, are -Copyright (c) 2004, 2006-2007 Glenn Randers-Pehrson, and are +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 distributed according to the same disclaimer and license as libpng-1.2.5 with the following individual added to the list of Contributing Authors @@ -1112,7 +1115,7 @@ Glenn Randers-Pehrson glennrp at users.sourceforge.net -May 15, 2007 +July 7, 2011 --- end of LICENSE ---