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

Legend:

Unmodified
Added
Removed

  • trunk/openjdk

  • trunk/openjdk/langtools/make/tools/CompileProperties/CompileProperties.java

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

  • trunk/openjdk/langtools/make/tools/CompileProperties/CompilePropertiesTask.java

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