Ignore:
Timestamp:
Mar 26, 2011, 8:39:20 PM (14 years ago)
Author:
dmik
Message:

trunk: Merged in openjdk6 b22 from branches/vendor/oracle.

Location:
trunk/openjdk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/openjdk

  • trunk/openjdk/hotspot/THIRD_PARTY_README

    r2 r278  
    11391139* Fast Infoset ver. 0.1 software ("Software")
    11401140*
    1141 * Copyright, 2004-2005 Sun Microsystems, Inc. All Rights Reserved.
     1141* Copyright (c) 2004, 2005, Oracle and/or its affiliates. All rights reserved.
    11421142*
    11431143* Software is licensed under the Apache License, Version 2.0 (the "License");
     
    11521152* License for the specific language governing permissions and limitations.
    11531153*
    1154 * Sun supports and benefits from the global community of open source
     1154* Oracle supports and benefits from the global community of open source
    11551155* developers, and thanks the community for its important contributions and
    1156 * open standards-based technology, which Sun has adopted into many of its
     1156* open standards-based technology, which Oracle has adopted into many of its
    11571157* products.
    11581158*
Note: See TracChangeset for help on using the changeset viewer.