Merge

Fri, 01 Aug 2014 11:05:24 +0100

author
coffeys
date
Fri, 01 Aug 2014 11:05:24 +0100
changeset 691
c2c84a386617
parent 690
c0834af12da5
parent 630
57cd66833abf
child 692
749e122a0123

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Tue Jul 22 10:44:17 2014 -0700
     1.2 +++ b/.hgtags	Fri Aug 01 11:05:24 2014 +0100
     1.3 @@ -309,6 +309,9 @@
     1.4  31d43d250c836c13fcc87025837783788c5cd0de jdk8u20-b21
     1.5  2d360fb1b2b89c90133231f9ed5f823997b70c19 jdk8u20-b22
     1.6  f3bf1b270fea8b17aa2846f962f7514b6f772ab4 jdk8u20-b23
     1.7 +1277c0d492fd9253f1ea2730eb160953397bd939 jdk8u20-b24
     1.8 +1277c0d492fd9253f1ea2730eb160953397bd939 jdk8u20-b25
     1.9 +7025a2c10ea4116ce8f31bb1e305f732aa1025f0 jdk8u20-b26
    1.10  efc85d318f4697f40bdd1f3757677be97f1758d9 jdk8u25-b00
    1.11  a76779e1b0376650dfc29a1f3b14760f05e0fc6d jdk8u25-b01
    1.12  3d31955043b9f1807c9d695c7b5d604d11c132cf jdk8u25-b02
    1.13 @@ -318,4 +321,6 @@
    1.14  433da54f73257545d95edbc356fdb0e37a9d95eb jdk8u25-b06
    1.15  cccfc3f8dec888c8fe86c212a51af2fba1e11aef jdk8u25-b07
    1.16  c758be4c3cac65a2744bf4e7ed9bdabb85234de2 jdk8u25-b08
    1.17 +73423d29fe362e843cdccad510e2e44e2899bc9e jdk8u25-b09
    1.18 +391b45e0081afcf3db709878916063a63dca7b05 jdk8u25-b10
    1.19  3a676fe898c93ad3afcaa55a71da96455e5f230e jdk8u31-b00
     2.1 --- a/THIRD_PARTY_README	Tue Jul 22 10:44:17 2014 -0700
     2.2 +++ b/THIRD_PARTY_README	Fri Aug 01 11:05:24 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