Mercurial > hg > icedtea7-forest-aarch64 > langtools
changeset 941:b1b898c00b71
Merge
author | lana |
---|---|
date | Mon, 07 Mar 2011 11:37:54 -0800 |
parents | ca32f2986301 (current diff) e77e98f936e8 (diff) |
children | cb9493a80341 |
files | |
diffstat | 2 files changed, 7 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Mar 07 14:31:50 2011 +0000 +++ b/.hgtags Mon Mar 07 11:37:54 2011 -0800 @@ -105,3 +105,5 @@ d7225b476a5d1aebffb8827e7c72ba2e1651f4e7 jdk7-b128 1383d1ee8b5db13d5df9523d1760df17b9d228d4 jdk7-b129 7a98db8cbfce77a619057aa4fdde69d2a06d4101 jdk7-b130 +67221b8643b478c4fceacc89240db876455aae76 jdk7-b131 +e3d011d59a33acef79eff7523bef069557e91002 jdk7-b132
--- a/LICENSE Mon Mar 07 14:31:50 2011 +0000 +++ b/LICENSE Mon Mar 07 11:37:54 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