Mercurial > hg > release > icedtea7-forest-2.4
changeset 827:3e965943d66c
Merge
author | asaha |
---|---|
date | Mon, 05 Aug 2013 13:43:19 -0700 |
parents | cf763e7e864c (current diff) 9a08e6d6eb84 (diff) |
children | 61343f60f25a |
files | .hgtags |
diffstat | 2 files changed, 34 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Aug 05 11:50:14 2013 -0700 +++ b/.hgtags Mon Aug 05 13:43:19 2013 -0700 @@ -348,8 +348,9 @@ 3fdfe7f1b06354e11e8af51b7c653c8a0adb3987 jdk7u40-b33 a1ae13479e8767329fa20774b5cea5976aaeb37b jdk7u40-b34 af755d12719e898e3af917e8a56b64ebf83019bc jdk7u40-b35 +59598f7b6a7be5e0470447694c1f5b7d951f6ff1 jdk7u40-b36 +5bfb3aa1655e5364a8c1c17343ff84dad7e13f25 jdk7u40-b37 07e41ff8674c9438cb1124cf78eed8636ed5d4fa jdk7u45-b02 23c983c352a170d7a5fb7d703081daf1816d257a jdk7u45-b03 1018a8ab686da6c1be22bec3ab9d01b2dc206333 jdk7u45-b04 -807cce4fa46aa4e11b7751230c52505ca918bce2 jdk7u45-b05 -0000000000000000000000000000000000000000 jdk7u45-b05 +22e0ca1fa645d0518b514159afafe34335699c11 jdk7u45-b05
--- a/THIRD_PARTY_README Mon Aug 05 11:50:14 2013 -0700 +++ b/THIRD_PARTY_README Mon Aug 05 13:43:19 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