Merge

Thu, 14 Jul 2011 18:56:42 -0700

author
lana
date
Thu, 14 Jul 2011 18:56:42 -0700
changeset 355
05e24d6ed56d
parent 354
0b615980879e
parent 353
04734fe746f0
child 357
f42e3d9394b4

Merge

     1.1 --- a/.hgtags	Thu Jun 30 16:51:35 2011 -0700
     1.2 +++ b/.hgtags	Thu Jul 14 18:56:42 2011 -0700
     1.3 @@ -121,3 +121,4 @@
     1.4  7203965666a4fe63bf82f5e4204f41ce6285e716 jdk7-b144
     1.5  55e9ebf032186c333e5964ed044419830ac02693 jdk7-b145
     1.6  2d38c2a79c144c30cd04d143d83ee7ec6af40771 jdk7-b146
     1.7 +d91364304d7c4ecd34caffdba2b840aeb0d10b51 jdk7-b147
     2.1 --- a/THIRD_PARTY_README	Thu Jun 30 16:51:35 2011 -0700
     2.2 +++ b/THIRD_PARTY_README	Thu Jul 14 18:56:42 2011 -0700
     2.3 @@ -1876,6 +1876,39 @@
     2.4  
     2.5  -------------------------------------------------------------------------------
     2.6  
     2.7 +%% This notice is provided with respect to SoftFloat version 2b, which is 
     2.8 +included with JRE 7, JDK 7, and OpenJDK 7 on Linux/ARM.
     2.9 +
    2.10 +--- begin of LICENSE ---
    2.11 +
    2.12 +Use of any of this software is governed by the terms of the license below:
    2.13 +
    2.14 +SoftFloat was written by me, John R. Hauser. This work was made possible in 
    2.15 +part by the International Computer Science Institute, located at Suite 600, 
    2.16 +1947 Center Street, Berkeley, California 94704. Funding was partially 
    2.17 +provided by the National Science Foundation under grant MIP-9311980. The 
    2.18 +original version of this code was written as part of a project to build 
    2.19 +a fixed-point vector processor in collaboration with the University of 
    2.20 +California at Berkeley, overseen by Profs. Nelson Morgan and John Wawrzynek. 
    2.21 +
    2.22 +THIS SOFTWARE IS DISTRIBUTED AS IS, FOR FREE. Although reasonable effort 
    2.23 +has been made to avoid it, THIS SOFTWARE MAY CONTAIN FAULTS THAT WILL AT 
    2.24 +TIMES RESULT IN INCORRECT BEHAVIOR. USE OF THIS SOFTWARE IS RESTRICTED TO 
    2.25 +PERSONS AND ORGANIZATIONS WHO CAN AND WILL TAKE FULL RESPONSIBILITY FOR ALL 
    2.26 +LOSSES, COSTS, OR OTHER PROBLEMS THEY INCUR DUE TO THE SOFTWARE, AND WHO 
    2.27 +FURTHERMORE EFFECTIVELY INDEMNIFY JOHN HAUSER AND THE INTERNATIONAL COMPUTER 
    2.28 +SCIENCE INSTITUTE (possibly via similar legal warning) AGAINST ALL LOSSES, 
    2.29 +COSTS, OR OTHER PROBLEMS INCURRED BY THEIR CUSTOMERS AND CLIENTS DUE TO THE 
    2.30 +SOFTWARE. 
    2.31 +
    2.32 +Derivative works are acceptable, even for commercial purposes, provided 
    2.33 +that the minimal documentation requirements stated in the source code are 
    2.34 +satisfied. 
    2.35 +
    2.36 +--- end of LICENSE ---
    2.37 +
    2.38 +-------------------------------------------------------------------------------
    2.39 +
    2.40  %% Portions licensed from Taligent, Inc.
    2.41  
    2.42  -------------------------------------------------------------------------------

mercurial