Mercurial > hg > release > icedtea7-forest-2.0 > jaxp
changeset 227:b693ccf23fb7
Merge
author | lana |
---|---|
date | Mon, 07 Mar 2011 11:56:06 -0800 |
parents | 877fd25c5a2f (current diff) 8e1148c7911b (diff) |
children | 02d4672e8c05 |
files | |
diffstat | 2 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Wed Mar 02 12:00:41 2011 -0800 +++ b/.hgtags Mon Mar 07 11:56:06 2011 -0800 @@ -105,3 +105,5 @@ a42c6132c746c86e9fc27ec80cbd699f6ee5edca jdk7-b128 f5b60c5a310f992c6ca627d17ca3e042f0e0b2c3 jdk7-b129 ab107c1bc4b918404b191838c455e9b2892389f3 jdk7-b130 +eab6f27131e4e2f0af0016b35b18ae65cdd249d9 jdk7-b131 +abe04c59a556a3821c30bd8839e3c74f5d4281d1 jdk7-b132
--- a/LICENSE Wed Mar 02 12:00:41 2011 -0800 +++ b/LICENSE Mon Mar 07 11:56:06 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