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/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.