changeset 885:bd15bc486b21

Merge
author asaha
date Mon, 22 Dec 2014 09:23:29 -0800
parents ce00072d4361 (current diff) e2c9f7f7febd (diff)
children 3b9d342f9f58
files .hgtags
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Dec 17 09:10:27 2014 -0800
+++ b/.hgtags	Mon Dec 22 09:23:29 2014 -0800
@@ -366,5 +366,6 @@
 0d3a452720a58bc203869ad606a4ea346c14c291 jdk8u40-b16
 bff1a326ac97c543b9c271adebc9deeda974edb1 jdk8u40-b17
 a1e2c13de84e00f2aedf4c40e96347306ede84f3 jdk8u40-b18
+8bbc2bb414b7e9331c2014c230553d72c9d161c5 jdk8u40-b19
 5761efbc739fdedcbff224e22f920e88b29af4cf jdk8u45-b00
 6a52852476c9ccb2d52153d1b94b675e863bb28c jdk8u45-b01
--- a/THIRD_PARTY_README	Wed Dec 17 09:10:27 2014 -0800
+++ b/THIRD_PARTY_README	Mon Dec 22 09:23:29 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