comparison THIRD_PARTY_README @ 4419:7b2efda91ffc

Merge
author amurillo
date Thu, 24 Jan 2013 11:29:13 -0800
parents f6ba9007b2c6
children b5c3f432e953
comparison
equal deleted inserted replaced
4:7921b0033b12 5:09cc33fd0225
214 214
215 %% This notice is provided with respect to Elliptic Curve Cryptography, which 215 %% This notice is provided with respect to Elliptic Curve Cryptography, which
216 is included with JRE 7, JDK 7, and OpenJDK 7. 216 is included with JRE 7, JDK 7, and OpenJDK 7.
217 217
218 You are receiving a copy of the Elliptic Curve Cryptography library in source 218 You are receiving a copy of the Elliptic Curve Cryptography library in source
219 form with the JDK 7 source distribution and object code in the JRE 7 & JDK 7 219 form with the JDK 7 and OpenJDK7 source distributions, and as object code in
220 runtime. 220 the JRE 7 & JDK 7 runtimes.
221 221
222 The terms of the Oracle license do NOT apply to the Elliptic Curve 222 In the case of the JRE 7 & JDK 7 runtimes, the terms of the Oracle license do
223 Cryptography library program; it is licensed under the following license, 223 NOT apply to the Elliptic Curve Cryptography library; it is licensed under the
224 separately from the Oracle programs you receive. If you do not wish to install 224 following license, separately from Oracle's JDK & JRE. If you do not wish to
225 this program, you may delete the library named libsunec.so (on Solaris and 225 install the Elliptic Curve Cryptography library, you may delete the library
226 Linux systems) or sunec.dll (on Windows systems) from the JRE bin directory 226 named libsunec.so (on Solaris and Linux systems) or sunec.dll (on Windows
227 reserved for native libraries. 227 systems) from the JRE bin directory reserved for native libraries.
228
228 229
229 --- begin of LICENSE --- 230 --- begin of LICENSE ---
230 231
231 GNU LESSER GENERAL PUBLIC LICENSE 232 GNU LESSER GENERAL PUBLIC LICENSE
232 Version 2.1, February 1999 233 Version 2.1, February 1999
998 999
999 %% Portions Copyright Eastman Kodak Company 1992 1000 %% Portions Copyright Eastman Kodak Company 1992
1000 1001
1001 ------------------------------------------------------------------------------- 1002 -------------------------------------------------------------------------------
1002 1003
1003 %% This notice is provided with respect to libpng 1.2.18, which is 1004 %% This notice is provided with respect to libpng 1.5.4, which is
1004 included with JRE 7, JDK 7, and OpenJDK 7. 1005 included with JRE 7, JDK 7, and OpenJDK 7.
1005 1006
1006 --- begin of LICENSE --- 1007 --- begin of LICENSE ---
1007 1008
1008 This copy of the libpng notices is provided for your convenience. In case of 1009 This copy of the libpng notices is provided for your convenience. In case of
1012 COPYRIGHT NOTICE, DISCLAIMER, and LICENSE: 1013 COPYRIGHT NOTICE, DISCLAIMER, and LICENSE:
1013 1014
1014 If you modify libpng you may insert additional notices immediately following 1015 If you modify libpng you may insert additional notices immediately following
1015 this sentence. 1016 this sentence.
1016 1017
1017 libpng versions 1.2.6, August 15, 2004, through 1.2.18, May 15, 2007, are 1018 This code is released under the libpng license.
1018 Copyright (c) 2004, 2006-2007 Glenn Randers-Pehrson, and are 1019
1020 libpng versions 1.2.6, August 15, 2004, through 1.5.4, July 7, 2011, are
1021 Copyright (c) 2004, 2006-2011 Glenn Randers-Pehrson, and are
1019 distributed according to the same disclaimer and license as libpng-1.2.5 1022 distributed according to the same disclaimer and license as libpng-1.2.5
1020 with the following individual added to the list of Contributing Authors 1023 with the following individual added to the list of Contributing Authors
1021 1024
1022 Cosmin Truta 1025 Cosmin Truta
1023 1026
1110 Libpng is OSI Certified Open Source Software. OSI Certified Open Source is a 1113 Libpng is OSI Certified Open Source Software. OSI Certified Open Source is a
1111 certification mark of the Open Source Initiative. 1114 certification mark of the Open Source Initiative.
1112 1115
1113 Glenn Randers-Pehrson 1116 Glenn Randers-Pehrson
1114 glennrp at users.sourceforge.net 1117 glennrp at users.sourceforge.net
1115 May 15, 2007 1118 July 7, 2011
1116 1119
1117 --- end of LICENSE --- 1120 --- end of LICENSE ---
1118 1121
1119 ------------------------------------------------------------------------------- 1122 -------------------------------------------------------------------------------
1120 1123