Mercurial > hg > release > icedtea7-forest-2.4 > langtools
changeset 1589:c8f4a544ada6
Merge
author | asaha |
---|---|
date | Mon, 05 Aug 2013 13:50:35 -0700 |
parents | a6be1495ff24 (current diff) 993a01f0ab41 (diff) |
children | 6f492dc935ad |
files | .hgtags |
diffstat | 2 files changed, 34 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Aug 05 11:54:06 2013 -0700 +++ b/.hgtags Mon Aug 05 13:50:35 2013 -0700 @@ -350,9 +350,10 @@ e36d8f754801c9d17585a9469f9b33f9799167f8 jdk7u40-b33 08c5065870ef40008711a3d3ee3230323e5f5910 jdk7u40-b34 524b9f7e6cabc8f7bad1824090e9b0dbf14ece74 jdk7u40-b35 +6837776bcdfafd0f963667156633142d433860f3 jdk7u40-b36 +31908290e4c2241ae9a8000c2a80e0f5fbad2a2c jdk7u40-b37 9bbfba4981e1db5016bbfbc23025763966021c26 jdk7u45-b01 61d5b73ae0ac46268490e2f0dfa1f69a5acda73f jdk7u45-b02 2fe27ae865e723473225756f1920d9d76d47b903 jdk7u45-b03 bede296dc848533abae859e61584a517df2773ae jdk7u45-b04 -6eb9444e0f461f7dcb901c671907d7ad14bc2718 jdk7u45-b05 -0000000000000000000000000000000000000000 jdk7u45-b05 +e989f2f2b5cb639a23a5e67da0d52766acf549a2 jdk7u45-b05
--- a/THIRD_PARTY_README Mon Aug 05 11:54:06 2013 -0700 +++ b/THIRD_PARTY_README Mon Aug 05 13:50:35 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