Mercurial > hg > release > icedtea7-forest-2.4 > corba
changeset 774:37de564abe4c
Merge
author | asaha |
---|---|
date | Mon, 05 Aug 2013 14:57:54 -0700 |
parents | b2871fcc688f (current diff) b7baf058aef2 (diff) |
children | 435dd0e1ab9e |
files | .hgtags |
diffstat | 2 files changed, 34 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Aug 05 11:50:20 2013 -0700 +++ b/.hgtags Mon Aug 05 14:57:54 2013 -0700 @@ -350,9 +350,10 @@ 1b7fbfdc31b859097d6a365ad0ba0e8ef92b4063 jdk7u40-b33 ddd543ddf33017a15623cdf6908ae4ef2958e24e jdk7u40-b34 fab3339a833da9631ead479621edcf6df2df457d jdk7u40-b35 +cd3871b1516988ea4a3099d6e1886abe2e74e771 jdk7u40-b36 +dc9a63376b39223bfb612d9e8efd275023de6399 jdk7u40-b37 4f54264ca4df2fc50fbb9bb2654dad97776d10ac jdk7u45-b01 1a1a1dedf437c50797a49c21a12161a79c761757 jdk7u45-b02 3a2cca8c2f209b533af6c1201cc8aee43628e578 jdk7u45-b03 4f4f7869bd6585042ad9596426dd1aa0829b8e98 jdk7u45-b04 -4e6f135b2779334b987a0d9f6dbb7732f008ec7e jdk7u45-b05 -0000000000000000000000000000000000000000 jdk7u45-b05 +faee62d13040eae3d081f0383843a391ceef1edd jdk7u45-b05
--- a/THIRD_PARTY_README Mon Aug 05 11:50:20 2013 -0700 +++ b/THIRD_PARTY_README Mon Aug 05 14:57:54 2013 -0700 @@ -1912,6 +1912,35 @@ ------------------------------------------------------------------------------- +%% This notice is provided with respect to Sparkle v.1.5, +which is included with JRE 7 on Mac OS X. + +--- begin of LICENSE --- + +Copyright (c) 2012 Sparkle.org and Andy Matuschak + +Permission is hereby granted, free of charge, to any person obtaining a copy +of this software and associated documentation files (the "Software"), to deal +in the Software without restriction, including without limitation the rights +to use, copy, modify, merge, publish, distribute, sublicense, and/or sell +copies of the Software, and to permit persons to whom the Software is +furnished to do so, subject to the following conditions: + +The above copyright notice and this permission notice shall be included in all +copies or substantial portions of the Software. + +THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR +IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE +AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, +OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE +SOFTWARE. + +--- end of LICENSE --- + +------------------------------------------------------------------------------- + %% Portions licensed from Taligent, Inc. ------------------------------------------------------------------------------- @@ -3169,12 +3198,12 @@ %% This notice is provided with respect to the following which is included with JRE 7, JDK 7, and OpenJDK 7, except where noted: - Apache Derby 10.8.1.2 [included with JDK 7 only] + Apache Derby 10.8.3.0 [included with JDK 7 only] Apache Jakarta BCEL 5.2 Apache Jakarta Regexp 1.4 Apache Santuario XMLSec-Java 1.4.2 Apache Xalan-Java 2.7.1 - Apache Xerces2 Java 2.10.0 + Apache Xerces2 Java 2.11.0 Apache XML Resolver 1.1