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

Legend:

Unmodified
Added
Removed

  • trunk/openjdk

  • trunk/openjdk/jdk/make/netbeans/jconsole/build.properties

    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#
    44# Redistribution and use in source and binary forms, with or without
    … …  
    1313#     documentation and/or other materials provided with the distribution.
    1414#
    15 #   - Neither the name of Sun Microsystems nor the names of its
     15#   - Neither the name of Oracle nor the names of its
    1616#     contributors may be used to endorse or promote products derived
    1717#     from this software without specific prior written permission.

  • trunk/openjdk/jdk/make/netbeans/jconsole/build.xml

    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
    44 Redistribution and use in source and binary forms, with or without
    … …  
    1313     documentation and/or other materials provided with the distribution.
    1414
    15    - Neither the name of Sun Microsystems nor the names of its
     15   - Neither the name of Oracle nor the names of its
    1616     contributors may be used to endorse or promote products derived
    1717     from this software without specific prior written permission.

  • trunk/openjdk/jdk/make/netbeans/jconsole/nbproject/project.xml

    r2 r278  
    22
    33<!--
    4  Copyright 2007 Sun Microsystems, Inc.  All Rights Reserved.
     4 Copyright (c) 2007, Oracle and/or its affiliates. All rights reserved.
    55
    66 Redistribution and use in source and binary forms, with or without
    … …  
    1515     documentation and/or other materials provided with the distribution.
    1616
    17    - Neither the name of Sun Microsystems nor the names of its
     17   - Neither the name of Oracle nor the names of its
    1818     contributors may be used to endorse or promote products derived
    1919     from this software without specific prior written permission.
Note: See TracChangeset for help on using the changeset viewer.