Merge

Wed, 17 Dec 2014 12:47:55 -0800

author
asaha
date
Wed, 17 Dec 2014 12:47:55 -0800
changeset 836
e2c9f7f7febd
parent 835
c226a104a7ca
parent 790
445eceffc829
child 838
cf835187681d
child 893
bd15bc486b21

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Tue Dec 16 14:00:37 2014 -0800
     1.2 +++ b/.hgtags	Wed Dec 17 12:47:55 2014 -0800
     1.3 @@ -366,3 +366,4 @@
     1.4  0d3a452720a58bc203869ad606a4ea346c14c291 jdk8u40-b16
     1.5  bff1a326ac97c543b9c271adebc9deeda974edb1 jdk8u40-b17
     1.6  a1e2c13de84e00f2aedf4c40e96347306ede84f3 jdk8u40-b18
     1.7 +8bbc2bb414b7e9331c2014c230553d72c9d161c5 jdk8u40-b19
     2.1 --- a/THIRD_PARTY_README	Tue Dec 16 14:00:37 2014 -0800
     2.2 +++ b/THIRD_PARTY_README	Wed Dec 17 12:47:55 2014 -0800
     2.3 @@ -3385,7 +3385,7 @@
     2.4  included with JRE 8, JDK 8, and OpenJDK 8.
     2.5  
     2.6    Apache Commons Math 3.2
     2.7 -  Apache Derby 10.10.1.3        
     2.8 +  Apache Derby 10.11.1.2
     2.9    Apache Jakarta BCEL 5.1 
    2.10    Apache Jakarta Regexp 1.4 
    2.11    Apache Santuario XML Security for Java 1.5.4

mercurial