Merge jdk8-b127

Wed, 29 Jan 2014 11:12:25 -0800

author
lana
date
Wed, 29 Jan 2014 11:12:25 -0800
changeset 2272
bb69217ed812
parent 2271
305b97f4651b
parent 2256
afa91c54ff00
child 2273
09cdd3b493c0

Merge

     1.1 --- a/THIRD_PARTY_README	Fri Jan 24 15:08:34 2014 -0800
     1.2 +++ b/THIRD_PARTY_README	Wed Jan 29 11:12:25 2014 -0800
     1.3 @@ -1400,7 +1400,7 @@
     1.4  -------------------------------------------------------------------------------
     1.5  
     1.6  %% This notice is provided with respect to Little CMS 2.4, which may be 
     1.7 -included with OpenJDK 8.
     1.8 +included with JRE 8, JDK 8, and OpenJDK 8.
     1.9  
    1.10  --- begin of LICENSE ---
    1.11  

mercurial