# HG changeset patch # User ohair # Date 1297891741 28800 # Node ID da55264ff2fb5f4bb170d03da664625d355734a7 # Parent cc58c11af15411042719e9c82707fdbef60a9e0f 7013964: openjdk LICENSE file needs rebranding Reviewed-by: darcy, katleman, jjg diff -r cc58c11af154 -r da55264ff2fb LICENSE --- a/LICENSE Thu Feb 10 16:24:23 2011 -0800 +++ b/LICENSE Wed Feb 16 13:29:01 2011 -0800 @@ -325,11 +325,11 @@ "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