Merge

Wed, 01 Jul 2015 22:01:10 -0700

author
asaha
date
Wed, 01 Jul 2015 22:01:10 -0700
changeset 1001
33bb1883ba9e
parent 1000
01dc133fcf1e
parent 951
0828bb652173
child 1003
b0779099d006

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Wed Jun 24 11:08:24 2015 -0700
     1.2 +++ b/.hgtags	Wed Jul 01 22:01:10 2015 -0700
     1.3 @@ -440,3 +440,4 @@
     1.4  eb0caffe34c6bea2ff40966757142b3dcd3a2a4c jdk8u60-b19
     1.5  4f3a29adbf4cfa2127e1108d82aaaa0d29f3c583 jdk8u60-b20
     1.6  d68de92de3bad991546b11d77de6e9c17edf7ec2 jdk8u60-b21
     1.7 +3a04901d83880634ecd70c8be992189228ccd746 jdk8u60-b22
     2.1 --- a/THIRD_PARTY_README	Wed Jun 24 11:08:24 2015 -0700
     2.2 +++ b/THIRD_PARTY_README	Wed Jul 01 22:01:10 2015 -0700
     2.3 @@ -1140,37 +1140,6 @@
     2.4  
     2.5  --------------------------------------------------------------------------------
     2.6  
     2.7 -%% This notice is provided with respect to JSON, which may be included 
     2.8 -with JRE 8 & JDK 8.
     2.9 -
    2.10 ---- begin of LICENSE ---
    2.11 -
    2.12 -Copyright (c) 2002 JSON.org
    2.13 -
    2.14 -Permission is hereby granted, free of charge, to any person obtaining a copy
    2.15 -of this software and associated documentation files (the "Software"), to deal
    2.16 -in the Software without restriction, including without limitation the rights
    2.17 -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
    2.18 -copies of the Software, and to permit persons to whom the Software is
    2.19 -furnished to do so, subject to the following conditions:
    2.20 -
    2.21 -The above copyright notice and this permission notice shall be included in all
    2.22 -copies or substantial portions of the Software.
    2.23 -
    2.24 -The Software shall be used for Good, not Evil.
    2.25 -
    2.26 -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
    2.27 -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
    2.28 -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
    2.29 -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
    2.30 -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
    2.31 -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
    2.32 -SOFTWARE.
    2.33 -
    2.34 ---- end of LICENSE ---
    2.35 -
    2.36 --------------------------------------------------------------------------------
    2.37 -
    2.38  %% This notice is provided with respect to Kerberos functionality, which 
    2.39  which may be included with JRE 8, JDK 8, and OpenJDK 8.
    2.40  
    2.41 @@ -1250,7 +1219,7 @@
    2.42  
    2.43  -------------------------------------------------------------------------------
    2.44  
    2.45 -%% This notice is provided with respect to libpng 1.6.16, which may be
    2.46 +%% This notice is provided with respect to libpng 1.6.16, which may be 
    2.47  included with JRE 8, JDK 8, and OpenJDK 8.
    2.48  
    2.49  --- begin of LICENSE ---
    2.50 @@ -1370,7 +1339,7 @@
    2.51  
    2.52  -------------------------------------------------------------------------------
    2.53  
    2.54 -%% This notice is provided with respect to libungif 4.1.3, which may be 
    2.55 +%% This notice is provided with respect to GIFLIB 5.1.1 & libungif 4.1.3, which may be 
    2.56  included with JRE 8, JDK 8, and OpenJDK 8.
    2.57  
    2.58  --- begin of LICENSE ---
    2.59 @@ -1399,13 +1368,13 @@
    2.60  
    2.61  -------------------------------------------------------------------------------
    2.62  
    2.63 -%% This notice is provided with respect to Little CMS 2.5, which may be 
    2.64 +%% This notice is provided with respect to Little CMS 2.7, which may be 
    2.65  included with JRE 8, JDK 8, and OpenJDK 8.
    2.66  
    2.67  --- begin of LICENSE ---
    2.68  
    2.69  Little CMS
    2.70 -Copyright (c) 1998-2011 Marti Maria Saguer
    2.71 +Copyright (c) 1998-2015 Marti Maria Saguer
    2.72  
    2.73  Permission is hereby granted, free of charge, to any person obtaining a copy
    2.74  of this software and associated documentation files (the "Software"), to deal

mercurial