diff options
author | cl <none@none> | 2011-02-23 15:48:23 -0800 |
---|---|---|
committer | cl <none@none> | 2011-02-23 15:48:23 -0800 |
commit | 01c54614a0e52e801c79e90747b6e72f97599a66 (patch) | |
tree | 5002bf94c88888a3acd79f9e840e862fe69ffa9b | |
parent | 11003ef157e76bdf2b7590e0ae6dcd5dbcfcdf95 (diff) | |
parent | 7a888685496b2dab151c211958f1f0d930db17d6 (diff) |
Mergejdk7-b131
-rw-r--r-- | LICENSE | 10 |
1 files changed, 5 insertions, 5 deletions
@@ -325,11 +325,11 @@ License instead of this License. "CLASSPATH" EXCEPTION TO THE GPL -Certain source files distributed by Sun Microsystems, Inc. are subject to -the following clarification and special exception to the GPL, but only where -Sun has expressly included in the particular source file's header the words -"Sun designates this particular file as subject to the "Classpath" exception -as provided by Sun in the LICENSE file that accompanied this code." +Certain source files distributed by Oracle America and/or its affiliates are +subject to the following clarification and special exception to the GPL, but +only where Oracle has expressly included in the particular source file's header +the words "Oracle designates this particular file as subject to the "Classpath" +exception as provided by Oracle in the LICENSE file that accompanied this code." Linking this library statically or dynamically with other modules is making a combined work based on this library. Thus, the terms and conditions of |