Ignore:
Timestamp:
Mar 26, 2011, 8:39:20 PM (15 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/LICENSE

    r2 r278  
    326326"CLASSPATH" EXCEPTION TO THE GPL
    327327
    328 Certain source files distributed by Sun Microsystems, Inc.  are subject to
    329 the following clarification and special exception to the GPL, but only where
    330 Sun has expressly included in the particular source file's header the words
    331 "Sun designates this particular file as subject to the "Classpath" exception
    332 as provided by Sun in the LICENSE file that accompanied this code."
     328Certain source files distributed by Oracle America and/or its affiliates are
     329subject to the following clarification and special exception to the GPL, but
     330only where Oracle has expressly included in the particular source file's header
     331the words "Oracle designates this particular file as subject to the "Classpath"
     332exception as provided by Oracle in the LICENSE file that accompanied this code."
    333333
    334334    Linking this library statically or dynamically with other modules is making
Note: See TracChangeset for help on using the changeset viewer.