Merge jdk8u60-b22 jdk8u66-b00

Sat, 27 Jun 2015 23:21:59 -0700

author
lana
date
Sat, 27 Jun 2015 23:21:59 -0700
changeset 847
6079c26a3b8f
parent 845
da59a84b687e
parent 846
085ad83dba3d
child 848
c21563403b7a

Merge

     1.1 --- a/THIRD_PARTY_README	Wed Jun 24 10:41:22 2015 -0700
     1.2 +++ b/THIRD_PARTY_README	Sat Jun 27 23:21:59 2015 -0700
     1.3 @@ -1140,37 +1140,6 @@
     1.4  
     1.5  --------------------------------------------------------------------------------
     1.6  
     1.7 -%% This notice is provided with respect to JSON, which may be included 
     1.8 -with JRE 8 & JDK 8.
     1.9 -
    1.10 ---- begin of LICENSE ---
    1.11 -
    1.12 -Copyright (c) 2002 JSON.org
    1.13 -
    1.14 -Permission is hereby granted, free of charge, to any person obtaining a copy
    1.15 -of this software and associated documentation files (the "Software"), to deal
    1.16 -in the Software without restriction, including without limitation the rights
    1.17 -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
    1.18 -copies of the Software, and to permit persons to whom the Software is
    1.19 -furnished to do so, subject to the following conditions:
    1.20 -
    1.21 -The above copyright notice and this permission notice shall be included in all
    1.22 -copies or substantial portions of the Software.
    1.23 -
    1.24 -The Software shall be used for Good, not Evil.
    1.25 -
    1.26 -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    1.27 -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    1.28 -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
    1.29 -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    1.30 -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
    1.31 -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
    1.32 -SOFTWARE.
    1.33 -
    1.34 ---- end of LICENSE ---
    1.35 -
    1.36 --------------------------------------------------------------------------------
    1.37 -
    1.38  %% This notice is provided with respect to Kerberos functionality, which 
    1.39  which may be included with JRE 8, JDK 8, and OpenJDK 8.
    1.40  
    1.41 @@ -1250,7 +1219,7 @@
    1.42  
    1.43  -------------------------------------------------------------------------------
    1.44  
    1.45 -%% This notice is provided with respect to libpng 1.6.16, which may be
    1.46 +%% This notice is provided with respect to libpng 1.6.16, which may be 
    1.47  included with JRE 8, JDK 8, and OpenJDK 8.
    1.48  
    1.49  --- begin of LICENSE ---
    1.50 @@ -1370,7 +1339,7 @@
    1.51  
    1.52  -------------------------------------------------------------------------------
    1.53  
    1.54 -%% This notice is provided with respect to libungif 4.1.3, which may be 
    1.55 +%% This notice is provided with respect to GIFLIB 5.1.1 & libungif 4.1.3, which may be 
    1.56  included with JRE 8, JDK 8, and OpenJDK 8.
    1.57  
    1.58  --- begin of LICENSE ---
    1.59 @@ -1399,13 +1368,13 @@
    1.60  
    1.61  -------------------------------------------------------------------------------
    1.62  
    1.63 -%% This notice is provided with respect to Little CMS 2.5, which may be 
    1.64 +%% This notice is provided with respect to Little CMS 2.7, which may be 
    1.65  included with JRE 8, JDK 8, and OpenJDK 8.
    1.66  
    1.67  --- begin of LICENSE ---
    1.68  
    1.69  Little CMS
    1.70 -Copyright (c) 1998-2011 Marti Maria Saguer
    1.71 +Copyright (c) 1998-2015 Marti Maria Saguer
    1.72  
    1.73  Permission is hereby granted, free of charge, to any person obtaining a copy
    1.74  of this software and associated documentation files (the "Software"), to deal

mercurial