Merge

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

author
coffeys
date
Fri, 01 Aug 2014 11:06:04 +0100
changeset 2633
ca516bc459f6
parent 2632
ea76c5c3adbe
parent 2517
eee827744830
child 2634
42175c1524a6

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Tue Jul 22 10:48:08 2014 -0700
     1.2 +++ b/.hgtags	Fri Aug 01 11:06:04 2014 +0100
     1.3 @@ -309,6 +309,9 @@
     1.4  7de1481c6cd88b42d815ae65e2d5b1cd918e11d1 jdk8u20-b21
     1.5  61fb0d8b169164ad5db15b6c497489cb30efb9c6 jdk8u20-b22
     1.6  5c1d6da1445aa3a2e5cf6101c70e79bfbe2745a5 jdk8u20-b23
     1.7 +9239118487dfb47ee850d2cc9b10a0a2e510da3c jdk8u20-b24
     1.8 +9239118487dfb47ee850d2cc9b10a0a2e510da3c jdk8u20-b25
     1.9 +5e6d409a72327a31b8a8f9aa0b32ef213c8b629c jdk8u20-b26
    1.10  f491f1581f196950c2cb858508dd06601968c417 jdk8u25-b00
    1.11  5bc865e0a2e3c59c1c8bc41e731509e1737ddea1 jdk8u25-b01
    1.12  4dec0c684a9ead80ea2bca6b042682367c1abf90 jdk8u25-b02
    1.13 @@ -318,4 +321,6 @@
    1.14  7a6309461a7294cc78789f547b0a652757d17156 jdk8u25-b06
    1.15  aad835b33337c22f4d632c2531c453de00a8f778 jdk8u25-b07
    1.16  224b8260b2c72e2902e48522240c97de11b3570a jdk8u25-b08
    1.17 +a5fa1a2bd63cfcce67dae074c07cd0f2baa8ddc0 jdk8u25-b09
    1.18 +0dfd4099658397efa118918cd43f79e194c320ea jdk8u25-b10
    1.19  c4bd223559aad3d152968a09d56241175d82c561 jdk8u31-b00
     2.1 --- a/THIRD_PARTY_README	Tue Jul 22 10:48:08 2014 -0700
     2.2 +++ b/THIRD_PARTY_README	Fri Aug 01 11:06:04 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