Merge

Mon, 07 Mar 2011 11:37:54 -0800

author
lana
date
Mon, 07 Mar 2011 11:37:54 -0800
changeset 915
b1b898c00b71
parent 914
ca32f2986301
parent 887
e77e98f936e8
child 916
cb9493a80341

Merge

     1.1 --- a/.hgtags	Mon Mar 07 14:31:50 2011 +0000
     1.2 +++ b/.hgtags	Mon Mar 07 11:37:54 2011 -0800
     1.3 @@ -105,3 +105,5 @@
     1.4  d7225b476a5d1aebffb8827e7c72ba2e1651f4e7 jdk7-b128
     1.5  1383d1ee8b5db13d5df9523d1760df17b9d228d4 jdk7-b129
     1.6  7a98db8cbfce77a619057aa4fdde69d2a06d4101 jdk7-b130
     1.7 +67221b8643b478c4fceacc89240db876455aae76 jdk7-b131
     1.8 +e3d011d59a33acef79eff7523bef069557e91002 jdk7-b132
     2.1 --- a/LICENSE	Mon Mar 07 14:31:50 2011 +0000
     2.2 +++ b/LICENSE	Mon Mar 07 11:37:54 2011 -0800
     2.3 @@ -325,11 +325,11 @@
     2.4  
     2.5  "CLASSPATH" EXCEPTION TO THE GPL
     2.6  
     2.7 -Certain source files distributed by Sun Microsystems, Inc.  are subject to
     2.8 -the following clarification and special exception to the GPL, but only where
     2.9 -Sun has expressly included in the particular source file's header the words
    2.10 -"Sun designates this particular file as subject to the "Classpath" exception
    2.11 -as provided by Sun in the LICENSE file that accompanied this code."
    2.12 +Certain source files distributed by Oracle America and/or its affiliates are
    2.13 +subject to the following clarification and special exception to the GPL, but
    2.14 +only where Oracle has expressly included in the particular source file's header
    2.15 +the words "Oracle designates this particular file as subject to the "Classpath"
    2.16 +exception as provided by Oracle in the LICENSE file that accompanied this code."
    2.17  
    2.18      Linking this library statically or dynamically with other modules is making
    2.19      a combined work based on this library.  Thus, the terms and conditions of

mercurial