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/hotspot/make/templates/bsd-header

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