Mercurial > hg > release > icedtea7-forest-2.6 > corba
changeset 294:b62418551e20 icedtea-1.14
Merge
author | andrew |
---|---|
date | Wed, 20 Apr 2011 04:37:46 +0100 |
parents | 59f02c101698 (current diff) a66c01d8bf89 (diff) |
children | 3232abe9f071 |
files | .hgtags |
diffstat | 2 files changed, 12 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Sat Apr 09 00:44:54 2011 +0100 +++ b/.hgtags Wed Apr 20 04:37:46 2011 +0100 @@ -106,3 +106,10 @@ 64775e83f4df894355f45555f50c410de6727b4e jdk7-b127 9baa8f94a11d6c5cab3f9f0e5a20106326d0932e jdk7-b128 66fa0fcc779296c99746b09efce6109944f82f30 jdk7-b129 +563a8f8b5be3940e9346cffac4eff9ed02b3c69f jdk7-b130 +9d6dd2cdfcb92612dbd836ecded87770d52b49db jdk7-b131 +1b1e75e8f476e5c07f0d2b035993895e2603e1f0 jdk7-b132 +671fe2e623ffefb4b7c312be919fc71eb48c1df1 jdk7-b133 +918003855fa0dba5acf4bf1fe36526d2fc4c1ba8 jdk7-b134 +e0b72ae5dc5e824b342801c8d1d336a55eb54e2c jdk7-b135 +48ef0c712e7cbf272f47f9224db92a3c6a9e2612 jdk7-b136
--- a/LICENSE Sat Apr 09 00:44:54 2011 +0100 +++ b/LICENSE Wed Apr 20 04:37:46 2011 +0100 @@ -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