Merge

Thu, 30 Jan 2014 14:30:55 -0800

author
asaha
date
Thu, 30 Jan 2014 14:30:55 -0800
changeset 507
f99a5ae9528a
parent 506
8e9658448c10
parent 472
de172acc095b
child 508
6ca7e69cc2fc

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Tue Jan 28 14:56:15 2014 -0800
     1.2 +++ b/.hgtags	Thu Jan 30 14:30:55 2014 -0800
     1.3 @@ -248,6 +248,7 @@
     1.4  ef71ecbcd7bc014b1be39a6d1b3a1fb663772c14 jdk8-b124
     1.5  ef71ecbcd7bc014b1be39a6d1b3a1fb663772c14 jdk8-b125
     1.6  7193a007a159ef9401b672af5c36c5b95e6e2943 jdk8-b126
     1.7 +8e46fe36e17595c24ccdbde7b34e3cbfb6056b42 jdk8-b127
     1.8  2fcd3ddb57a6c71e082c7f113f4063de9a967fcd jdk8u5-b01
     1.9  384ccf4e14cb90c89570e16a5f4ca440a69d6d93 jdk8u5-b02
    1.10  e423a4f2ec72ea0e24bea0fa77dd105095bbee67 jdk8u5-b03
     2.1 --- a/THIRD_PARTY_README	Tue Jan 28 14:56:15 2014 -0800
     2.2 +++ b/THIRD_PARTY_README	Thu Jan 30 14:30:55 2014 -0800
     2.3 @@ -1400,7 +1400,7 @@
     2.4  -------------------------------------------------------------------------------
     2.5  
     2.6  %% This notice is provided with respect to Little CMS 2.4, which may be 
     2.7 -included with OpenJDK 8.
     2.8 +included with JRE 8, JDK 8, and OpenJDK 8.
     2.9  
    2.10  --- begin of LICENSE ---
    2.11  

mercurial