Wed, 23 Feb 2011 15:49:00 -0800
Merge
1.1 --- a/LICENSE Fri Feb 18 14:23:43 2011 -0800 1.2 +++ b/LICENSE Wed Feb 23 15:49:00 2011 -0800 1.3 @@ -325,11 +325,11 @@ 1.4 1.5 "CLASSPATH" EXCEPTION TO THE GPL 1.6 1.7 -Certain source files distributed by Sun Microsystems, Inc. are subject to 1.8 -the following clarification and special exception to the GPL, but only where 1.9 -Sun has expressly included in the particular source file's header the words 1.10 -"Sun designates this particular file as subject to the "Classpath" exception 1.11 -as provided by Sun in the LICENSE file that accompanied this code." 1.12 +Certain source files distributed by Oracle America and/or its affiliates are 1.13 +subject to the following clarification and special exception to the GPL, but 1.14 +only where Oracle has expressly included in the particular source file's header 1.15 +the words "Oracle designates this particular file as subject to the "Classpath" 1.16 +exception as provided by Oracle in the LICENSE file that accompanied this code." 1.17 1.18 Linking this library statically or dynamically with other modules is making 1.19 a combined work based on this library. Thus, the terms and conditions of