Merge

Thu, 30 Jan 2014 13:58:45 -0800

author
asaha
date
Thu, 30 Jan 2014 13:58:45 -0800
changeset 1006
9b16a2748379
parent 1005
f990906fc6b7
parent 947
101e42de4686
child 1008
7d94d0555a5e

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Tue Jan 28 14:55:46 2014 -0800
     1.2 +++ b/.hgtags	Thu Jan 30 13:58:45 2014 -0800
     1.3 @@ -248,6 +248,7 @@
     1.4  790bbd46b2015e69ce301dae194c2b4141011f2d jdk8-b124
     1.5  790bbd46b2015e69ce301dae194c2b4141011f2d jdk8-b125
     1.6  9ccce5bf1b0ea0d3f3fb871be069f305f9cea530 jdk8-b126
     1.7 +2e2ffb9e4b690c63b32142861177390e0f2c40e9 jdk8-b127
     1.8  c41935d79b8744af8b7b56cd4d4ab781027fb22e jdk8u5-b01
     1.9  6f3357d3dbf83c1ef0098bcb853e3aa3b26f4cb8 jdk8u5-b02
    1.10  794b4365b6884e9a15f0840792539f5821814127 jdk8u5-b03
     2.1 --- a/THIRD_PARTY_README	Tue Jan 28 14:55:46 2014 -0800
     2.2 +++ b/THIRD_PARTY_README	Thu Jan 30 13:58:45 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