Mercurial > hg > openjdk > jdk7 > corba

changeset 253:a9335b646c1c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
7013964: openjdk LICENSE file needs rebranding Reviewed-by: darcy, katleman, jjg
author ohair
date Wed, 16 Feb 2011 13:29:20 -0800
parents 563a8f8b5be3
children 9d6dd2cdfcb9
files LICENSE
diffstat 1 files changed, 5 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- 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