changeset 753:5cd2b7e1836f

Merge
author asaha
date Mon, 22 Dec 2014 10:07:50 -0800
parents a140eb0caf04 cf30277c68fb
children 855a7b930205
files .hgtags
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Dec 17 09:12:18 2014 -0800
+++ b/.hgtags	Mon Dec 22 10:07:50 2014 -0800
@@ -366,5 +366,6 @@
 8893690584dac2df7cc2e9b0a5ffe107266a160b jdk8u40-b16
 83c4d5aca2ff8fd0c6b2a7091018b71313371176 jdk8u40-b17
 fa07311627d085f1307f55298f59463bcf55db02 jdk8u40-b18
+c8b402c28fe51e25f3298e1266f2ae48bda8d3e0 jdk8u40-b19
 667a4aee3720373f5c286a50f537afd0ff4b65ae jdk8u45-b00
 cb6added4913f4899bd1689e77be1fe4efcff4f1 jdk8u45-b01
--- a/THIRD_PARTY_README	Wed Dec 17 09:12:18 2014 -0800
+++ b/THIRD_PARTY_README	Mon Dec 22 10:07:50 2014 -0800
@@ -3385,7 +3385,7 @@
 included with JRE 8, JDK 8, and OpenJDK 8.
 
   Apache Commons Math 3.2
-  Apache Derby 10.10.1.3        
+  Apache Derby 10.11.1.2
   Apache Jakarta BCEL 5.1 
   Apache Jakarta Regexp 1.4 
   Apache Santuario XML Security for Java 1.5.4