Ignore:
Timestamp:
Mar 26, 2011, 8:39:20 PM (15 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/make/hotspot_version

    r2 r278  
    11#
    2 # Copyright 2006-2009 Sun Microsystems, Inc.  All Rights Reserved.
     2# Copyright (c) 2006, 2009, Oracle and/or its affiliates. All rights reserved.
    33# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    44#
    … …  
    1717# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    1818#
    19 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    20 # CA 95054 USA or visit www.sun.com if you need additional information or
    21 # have any questions.
     19# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     20# or visit www.oracle.com if you need additional information or have any
     21# questions.
    2222#
    2323
    … …  
    3232
    3333# Don't put quotes (fail windows build).
    34 HOTSPOT_VM_COPYRIGHT=Copyright 2009
     34HOTSPOT_VM_COPYRIGHT=Copyright 2010
    3535
    36 HS_MAJOR_VER=16
     36HS_MAJOR_VER=19
    3737HS_MINOR_VER=0
    38 HS_BUILD_NUMBER=13
     38HS_BUILD_NUMBER=09
    3939
    4040JDK_MAJOR_VER=1
Note: See TracChangeset for help on using the changeset viewer.