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:
4 edited

Legend:

Unmodified
Added
Removed

  • trunk/openjdk

  • trunk/openjdk/make/templates/bsd-header

    r2 r278  
    1212    documentation and/or other materials provided with the distribution.
    1313
    14   - Neither the name of Sun Microsystems nor the names of its
     14  - Neither the name of Oracle nor the names of its
    1515    contributors may be used to endorse or promote products derived
    1616    from this software without specific prior written permission.

  • trunk/openjdk/make/templates/gpl-cp-header

    r2 r278  
    1 Copyright %YEARS% Sun Microsystems, Inc.  All Rights Reserved.
     1Copyright (c) %YEARS%, Oracle and/or its affiliates. All rights reserved.
    22DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    33
    44This code is free software; you can redistribute it and/or modify it
    55under the terms of the GNU General Public License version 2 only, as
    6 published by the Free Software Foundation.  Sun designates this
     6published by the Free Software Foundation.  Oracle designates this
    77particular file as subject to the "Classpath" exception as provided
    8 by Sun in the LICENSE file that accompanied this code.
     8by Oracle in the LICENSE file that accompanied this code.
    99
    1010This code is distributed in the hope that it will be useful, but WITHOUT
    … …  
    1818Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1919
    20 Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    21 CA 95054 USA or visit www.sun.com if you need additional information or
    22 have any questions.
     20Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21or visit www.oracle.com if you need additional information or have any
     22questions.

  • trunk/openjdk/make/templates/gpl-header

    r2 r278  
    1 Copyright %YEARS% Sun Microsystems, Inc.  All Rights Reserved.
     1Copyright (c) %YEARS%, Oracle and/or its affiliates. All rights reserved.
    22DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    33
    … …  
    1616Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1717
    18 Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    19 CA 95054 USA or visit www.sun.com if you need additional information or
    20 have any questions.
     18Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     19or visit www.oracle.com if you need additional information or have any
     20questions.
Note: See TracChangeset for help on using the changeset viewer.