Merge
authorduke
Wed, 05 Jul 2017 17:35:35 +0200
changeset 8276 732e04191cd6
parent 8275 590b6cc6f974 (diff)
parent 8272 71ea5ccb1e82 (current diff)
child 8280 911e751d2519
Merge
--- a/corba/.hgtags	Wed Jul 05 17:35:32 2017 +0200
+++ b/corba/.hgtags	Wed Jul 05 17:35:35 2017 +0200
@@ -104,3 +104,4 @@
 64775e83f4df894355f45555f50c410de6727b4e jdk7-b127
 9baa8f94a11d6c5cab3f9f0e5a20106326d0932e jdk7-b128
 66fa0fcc779296c99746b09efce6109944f82f30 jdk7-b129
+563a8f8b5be3940e9346cffac4eff9ed02b3c69f jdk7-b130
--- a/corba/LICENSE	Wed Jul 05 17:35:32 2017 +0200
+++ b/corba/LICENSE	Wed Jul 05 17:35:35 2017 +0200
@@ -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