changeset 6978:5217ec74ac63

Merge
author kevinw
date Thu, 18 Dec 2014 08:54:32 +0000
parents eb111e3a2379 c3933f52eeb3
children f06c27e55164
files
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Dec 04 12:43:45 2014 +0000
+++ b/.hgtags	Thu Dec 18 08:54:32 2014 +0000
@@ -562,3 +562,4 @@
 bc5a90a4db47f1c497d7894434c42325f595cd02 hs25.40-b22
 31d3306aad29e39929418ed43f28212a5f5306a3 jdk8u40-b18
 f8fc5cbe082ce0fb0c6c1dcd39493a16ed916353 hs25.40-b23
+d9349fa8822336e0244da0a8448f3e6b2d62741d jdk8u40-b19
--- a/THIRD_PARTY_README	Thu Dec 04 12:43:45 2014 +0000
+++ b/THIRD_PARTY_README	Thu Dec 18 08:54:32 2014 +0000
@@ -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