Merge

Wed, 17 Dec 2014 12:49:52 -0800

author
asaha
date
Wed, 17 Dec 2014 12:49:52 -0800
changeset 735
cf30277c68fb
parent 734
8f3f4002fb38
parent 684
a21c4edfdf44
child 737
244dbe773d21
child 794
5cd2b7e1836f

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Tue Dec 16 14:43:03 2014 -0800
     1.2 +++ b/.hgtags	Wed Dec 17 12:49:52 2014 -0800
     1.3 @@ -366,3 +366,4 @@
     1.4  8893690584dac2df7cc2e9b0a5ffe107266a160b jdk8u40-b16
     1.5  83c4d5aca2ff8fd0c6b2a7091018b71313371176 jdk8u40-b17
     1.6  fa07311627d085f1307f55298f59463bcf55db02 jdk8u40-b18
     1.7 +c8b402c28fe51e25f3298e1266f2ae48bda8d3e0 jdk8u40-b19
     2.1 --- a/THIRD_PARTY_README	Tue Dec 16 14:43:03 2014 -0800
     2.2 +++ b/THIRD_PARTY_README	Wed Dec 17 12:49:52 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