aboutsummaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorohair <none@none>2011-02-16 13:29:58 -0800
committerohair <none@none>2011-02-16 13:29:58 -0800
commitfe0b40c01de6c25026b5c38170187a4e08234fab (patch)
tree661b5aa42c247e74183a49b2a5c597c42fd4a101 /LICENSE
parentfb633a423c02478bbce8ae19b8b2dd97a0e3442e (diff)
7013964: openjdk LICENSE file needs rebranding
Reviewed-by: darcy, katleman, jjg
Diffstat (limited to 'LICENSE')
-rw-r--r--LICENSE10
1 files changed, 5 insertions, 5 deletions
diff --git a/LICENSE b/LICENSE
index eeab58c21..b40a0f457 100644
--- a/LICENSE
+++ b/LICENSE
@@ -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