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/jdk/test/start-Xvfb.sh

    r2 r278  
    11#!/bin/sh -f
    22#
    3 # Copyright 2009 Sun Microsystems, Inc.  All Rights Reserved.
     3# Copyright (c) 2009, Oracle and/or its affiliates. All rights reserved.
    44# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    55#
    66# This code is free software; you can redistribute it and/or modify it
    77# under the terms of the GNU General Public License version 2 only, as
    8 # published by the Free Software Foundation.  Sun designates this
     8# published by the Free Software Foundation.  Oracle designates this
    99# particular file as subject to the "Classpath" exception as provided
    10 # by Sun in the LICENSE file that accompanied this code.
     10# by Oracle in the LICENSE file that accompanied this code.
    1111#
    1212# This code is distributed in the hope that it will be useful, but WITHOUT
    … …  
    2020# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
    2121#
    22 # Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
    23 # CA 95054 USA or visit www.sun.com if you need additional information or
    24 # have any questions.
     22# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     23# or visit www.oracle.com if you need additional information or have any
     24# questions.
    2525#
    2626
Note: See TracChangeset for help on using the changeset viewer.