Merge

Fri, 31 Jan 2014 00:14:31 +0000

author
coffeys
date
Fri, 31 Jan 2014 00:14:31 +0000
changeset 575
051267e5161c
parent 573
bfb252ec85f6
parent 574
6d40c0d49c7a
child 576
7547c6a90a9e

Merge

     1.1 --- a/THIRD_PARTY_README	Thu Jan 23 20:42:37 2014 +0000
     1.2 +++ b/THIRD_PARTY_README	Fri Jan 31 00:14:31 2014 +0000
     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