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/src/share/test/pack200/pack.conf

    r2 r278  
    1 # Copyright 2003 Sun Microsystems, Inc.  All Rights Reserved.
     1# Copyright (c) 2003, Oracle and/or its affiliates. All rights reserved.
    22# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
    33#
    44# This code is free software; you can redistribute it and/or modify it
    55# under the terms of the GNU General Public License version 2 only, as
    6 # published by the Free Software Foundation.  Sun designates this
     6# published by the Free Software Foundation.  Oracle designates this
    77# particular file as subject to the "Classpath" exception as provided
    8 # by Sun in the LICENSE file that accompanied this code.
     8# by Oracle in the LICENSE file that accompanied this code.
    99#
    1010# This code is distributed in the hope that it will be useful, but WITHOUT
    … …  
    1818# Inc., 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.
     20# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
     21# or visit www.oracle.com if you need additional information or have any
     22# questions.
    2323#
    2424#
Note: See TracChangeset for help on using the changeset viewer.