Mercurial > hg > icedtea7-forest-aarch64
changeset 344:5d86d951426a jdk7-b131
Merge
author | cl |
---|---|
date | Wed, 23 Feb 2011 15:48:23 -0800 |
parents | 5466f13d19be (current diff) da55264ff2fb (diff) |
children | 0f62a65fb666 |
files | |
diffstat | 1 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/LICENSE Mon Feb 21 14:18:37 2011 -0500 +++ b/LICENSE Wed Feb 23 15:48:23 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