aboutsummaryrefslogtreecommitdiff
path: root/LICENSE
diff options
context:
space:
mode:
authorohair <none@none>2011-02-16 13:30:31 -0800
committerohair <none@none>2011-02-16 13:30:31 -0800
commit6b83f806ea8a40436c39570e5660396247281999 (patch)
tree6d9c59d1785a1e275fdd7f1db29e5f96db111cae /LICENSE
parent258ee76d77ff8b251dc918d8cde7b7c6ee52ec82 (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 b53eb1fd1..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 Oracle 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."
+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