comparison LICENSE @ 2221:0aa3b4908911 jdk7-b131

Merge
author cl
date Wed, 23 Feb 2011 15:48:46 -0800
parents cdef89d821bd
children
comparison
equal deleted inserted replaced
2210:0a2ecf4cc384 2221:0aa3b4908911
323 License instead of this License. 323 License instead of this License.
324 324
325 325
326 "CLASSPATH" EXCEPTION TO THE GPL 326 "CLASSPATH" EXCEPTION TO THE GPL
327 327
328 Certain source files distributed by Oracle and/or its affiliates, are subject to 328 Certain source files distributed by Oracle America and/or its affiliates are
329 the following clarification and special exception to the GPL, but only where 329 subject to the following clarification and special exception to the GPL, but
330 Oracle has expressly included in the particular source file's header the words 330 only where Oracle has expressly included in the particular source file's header
331 "Oracle designates this particular file as subject to the "Classpath" exception 331 the words "Oracle designates this particular file as subject to the "Classpath"
332 as provided by Oracle in the LICENSE file that accompanied this code." 332 exception as provided by Oracle in the LICENSE file that accompanied this code."
333 333
334 Linking this library statically or dynamically with other modules is making 334 Linking this library statically or dynamically with other modules is making
335 a combined work based on this library. Thus, the terms and conditions of 335 a combined work based on this library. Thus, the terms and conditions of
336 the GNU General Public License cover the whole combination. 336 the GNU General Public License cover the whole combination.
337 337