Merge

Thu, 14 Jul 2011 18:58:27 -0700

author
lana
date
Thu, 14 Jul 2011 18:58:27 -0700
changeset 1056
025a370b9fc3
parent 1055
7337295434b6
parent 1050
469e3bec9b27
child 1058
36f31b87b0ab

Merge

     1.1 --- a/.hgtags	Thu Jul 07 13:29:31 2011 -0700
     1.2 +++ b/.hgtags	Thu Jul 14 18:58:27 2011 -0700
     1.3 @@ -121,3 +121,4 @@
     1.4  8eb952f43b117d538f6ca5e9e43ff9ce7646c7ee jdk7-b144
     1.5  c455e2ae5c93014ae3fc475aba4509b5f70465f7 jdk7-b145
     1.6  9425dd4f53d5bfcd992d9aecea0eb7d8b2d4f62b jdk7-b146
     1.7 +58bc532d63418ac3c9b42460d89cdaf595c6f3e1 jdk7-b147
     2.1 --- a/THIRD_PARTY_README	Thu Jul 07 13:29:31 2011 -0700
     2.2 +++ b/THIRD_PARTY_README	Thu Jul 14 18:58:27 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