# HG changeset patch # User ohair # Date 1297891760 28800 # Node ID a9335b646c1c6858c47260a9a95d40fa970dbad2 # Parent 563a8f8b5be3940e9346cffac4eff9ed02b3c69f 7013964: openjdk LICENSE file needs rebranding Reviewed-by: darcy, katleman, jjg diff -r 563a8f8b5be3 -r a9335b646c1c LICENSE --- a/LICENSE Fri Feb 11 23:35:52 2011 -0800 +++ b/LICENSE Wed Feb 16 13:29:20 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