Merge

Fri, 01 Aug 2014 11:06:11 +0100

author
coffeys
date
Fri, 01 Aug 2014 11:06:11 +0100
changeset 1136
7186050bef4a
parent 1135
62bf127ed4d2
parent 945
8cd6af10dd4d
child 1137
923003a8c889

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Tue Jul 22 10:48:36 2014 -0700
     1.2 +++ b/.hgtags	Fri Aug 01 11:06:11 2014 +0100
     1.3 @@ -297,6 +297,9 @@
     1.4  f2925491b61b22ac42f8c30ee9c6723ffa401a4c jdk8u20-b21
     1.5  5332595fe7ba2a1fc5564cc2689f378b04a56eb4 jdk8u20-b22
     1.6  ad36f9454ce38d78be39fc819902e1223765ee5e jdk8u20-b23
     1.7 +d3da140e179343011017669a6dbfcc52b0e56f52 jdk8u20-b24
     1.8 +d3da140e179343011017669a6dbfcc52b0e56f52 jdk8u20-b25
     1.9 +a23ac9db4227d78b3389e01fa94a8cb695a8fb0a jdk8u20-b26
    1.10  7001e9f95b443a75e432205a29974c05b88e0fdc jdk8u25-b00
    1.11  a9f77bd14874d5f8fdf935704dd54a0451f2bc69 jdk8u25-b01
    1.12  895e47783e2ee6823496a5ae84039a4f50311c7d jdk8u25-b02
    1.13 @@ -306,4 +309,6 @@
    1.14  0a50d568a901700213fe40c38089748ca1d1af88 jdk8u25-b06
    1.15  25b719b33ac8f8ffb7e4353fddcda93ca6027b0d jdk8u25-b07
    1.16  0f74f65763a300cfe5f897b6b21f36d64f9d2115 jdk8u25-b08
    1.17 +158837f537e45fc4664a56ad4759f8a1b30cab73 jdk8u25-b09
    1.18 +7e00c05fc54b0404bf2eedda35dd38ae1ad23e50 jdk8u25-b10
    1.19  9b692a6e5f22228f822973d35610d37cb9dd9693 jdk8u31-b00
     2.1 --- a/THIRD_PARTY_README	Tue Jul 22 10:48:36 2014 -0700
     2.2 +++ b/THIRD_PARTY_README	Fri Aug 01 11:06:11 2014 +0100
     2.3 @@ -2,7 +2,7 @@
     2.4  -----------------------------
     2.5  
     2.6  %% This notice is provided with respect to ASM Bytecode Manipulation 
     2.7 -Framework v5.0, which may be included with JRE 8, and JDK 8, and 
     2.8 +Framework v5.0.3, which may be included with JRE 8, and JDK 8, and 
     2.9  OpenJDK 8.
    2.10  
    2.11  --- begin of LICENSE ---
    2.12 @@ -1471,7 +1471,7 @@
    2.13  version 2.0.
    2.14  
    2.15  The NSS libraries are supplied in executable form, built from unmodified
    2.16 -NSS source code labeled with the "NSS_3.13.1_RTM" release tag.
    2.17 +NSS source code labeled with the "NSS_3_16_RTM" HG tag.
    2.18  
    2.19  The NSS source code is available in the OpenJDK source code repository at:
    2.20      jdk/test/sun/security/pkcs11/nss/src
    2.21 @@ -3349,14 +3349,14 @@
    2.22  
    2.23  -------------------------------------------------------------------------------
    2.24  
    2.25 -%% This notice is provided with respect to zlib v1.2.5, which may be included 
    2.26 +%% This notice is provided with respect to zlib v1.2.8, which may be included 
    2.27  with JRE 8, JDK 8, and OpenJDK 8.
    2.28  
    2.29  --- begin of LICENSE ---
    2.30  
    2.31 -  version 1.2.5, July 18th, 2005
    2.32 -
    2.33 -  Copyright (C) 1995-2005 Jean-loup Gailly and Mark Adler
    2.34 +  version 1.2.8, April 28th, 2013
    2.35 +
    2.36 +  Copyright (C) 1995-2013 Jean-loup Gailly and Mark Adler
    2.37  
    2.38    This software is provided 'as-is', without any express or implied
    2.39    warranty.  In no event will the authors be held liable for any damages
    2.40 @@ -3382,11 +3382,11 @@
    2.41  -------------------------------------------------------------------------------
    2.42  
    2.43  %% This notice is provided with respect to the following which may be 
    2.44 -included with JRE 8, JDK 8, and OpenJDK 8, except where noted:
    2.45 -
    2.46 -  Apache Commons Math 2.2
    2.47 -  Apache Derby 10.10.1.2        [included with JDK 8]
    2.48 -  Apache Jakarta BCEL 5.2 
    2.49 +included with JRE 8, JDK 8, and OpenJDK 8.
    2.50 +
    2.51 +  Apache Commons Math 3.2
    2.52 +  Apache Derby 10.10.1.3        
    2.53 +  Apache Jakarta BCEL 5.1 
    2.54    Apache Jakarta Regexp 1.4 
    2.55    Apache Santuario XML Security for Java 1.5.4
    2.56    Apache Xalan-Java 2.7.1 

mercurial