changeset 359:78cd4b4fcb75

Merge
author andrew
date Thu, 22 Dec 2011 15:46:02 +0000
parents 4d9e4fb8af09 9f975e9d5e54
children ecb9fc90dea4
files .hgtags
diffstat 3 files changed, 36 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Fri Oct 14 00:55:29 2011 +0100
+++ b/.hgtags	Thu Dec 22 15:46:02 2011 +0000
@@ -124,5 +124,24 @@
 7033a5756ad552d88114594d8e2d2e4dc2c05963 jdk7-b144
 77ec0541aa2aa4da27e9e385a118a2e51e7fca24 jdk7-b145
 770227a4087e4e401fe87ccd19738440111c3948 jdk7-b146
+36f0efbc66ef8ace3cca8aa8d0c88f3334080f8a jdk7u1-b01
 73323cb3396260d93e0ab731fd2d431096ceed0f jdk7-b147
 d034cc90ecc266d78b87d1429c426669431fcc1f icedtea-2.0-branchpoint
+9515a2d034b4727c11aeea36354a549fbc469c4f jdk7u1-b02
+dd71cb354c573c1addcda269a7dd9144bfce9587 jdk7u1-b03
+eaee830124aa453627591d8f9eccb39d7e040876 jdk7u1-b04
+07247d9e7778ff1609e264e3090150c4b3117c3a jdk7u1-b05
+960011ba4bf209a567d33f739b515acca7bb44b7 jdk7u2-b01
+e1a1c0d722646ef1430cdaa91c9c2057aa4491fa jdk7u2-b04
+391d8aa6f432178fc82da63c07909cb70a0af7df jdk7u2-b05
+e4907c890e422be490bbe70da498e57c814e4d54 jdk7u2-b06
+b872671d204384fc70da68d375f41753bac3c0e0 jdk7u2-b07
+9ef47d349684df6710864c4bc477c64fdd260d6a jdk7u2-b08
+ec2bc054bfad730de577f281cd2a556304a05ab5 jdk7u2-b09
+9d3e2884a1a378d4b99662e47e86c08db4ea6a82 jdk7u1-b06
+59c003227deb9dca331c590126abd25f5feed78b jdk7u1-b07
+49aecdae2fba1730b5eda4f249e194881f2ffa63 jdk7u1-b08
+82330ae1ba8b29384644db0e3385cab88aae59c2 jdk7u2-b11
+56b02f8ef70391a67c9fa71157a8faafbdff4b74 jdk7u2-b12
+456ff1f14b14ef8cfe47cef95c8094f8443fa092 jdk7u2-b13
+62b846b0c3259cae732e75df50a1b180a2541178 jdk7u2-b21
--- a/.jcheck/conf	Fri Oct 14 00:55:29 2011 +0100
+++ b/.jcheck/conf	Thu Dec 22 15:46:02 2011 +0000
@@ -1,1 +1,2 @@
 project=jdk7
+bugids=dup
--- a/THIRD_PARTY_README	Fri Oct 14 00:55:29 2011 +0100
+++ b/THIRD_PARTY_README	Thu Dec 22 15:46:02 2011 +0000
@@ -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 ---