Mercurial > hg > openjdk > bsd-port > jaxws

changeset 237:65996fb136a7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge from main OpenJDK repository
author Greg Lewis <glewis@eyesbeyond.com>
date Thu, 03 Mar 2011 20:18:20 -0800
parents d75acd40032b (current diff) 359d0c8c00a0 (diff)
children 1821bc470e3b
files
diffstat 2 files changed, 7 insertions(+), 5 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Sun Feb 20 11:46:05 2011 -0800
+++ b/.hgtags	Thu Mar 03 20:18:20 2011 -0800
@@ -105,3 +105,5 @@
 88d74afc55938033e744b537a22714bb2c82c9c0 jdk7-b128
 0f7b39ad902424e949e3d2dca8411b884888a76f jdk7-b129
 ba1fac1c2083196422a12130db174334179a4d44 jdk7-b130
+438abc0356cd97d91b25f67cd1abc9883e22f6ed jdk7-b131
+0e57c3272d377eee04cc32c898e9a558051516b0 jdk7-b132
--- a/LICENSE	Sun Feb 20 11:46:05 2011 -0800
+++ b/LICENSE	Thu Mar 03 20:18:20 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