changeset 667:1f63fafc7262

Merge
author asaha
date Mon, 05 Aug 2013 13:47:31 -0700
parents 5af79e819bc1 c2cc41cf6055
children 8da3d41d9469
files .hgtags
diffstat 2 files changed, 34 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Aug 05 11:52:42 2013 -0700
+++ b/.hgtags	Mon Aug 05 13:47:31 2013 -0700
@@ -350,9 +350,10 @@
 3ceef25a8cdd9a27a7a2dea0efd8721100cfa30f jdk7u40-b33
 1ef33d25dd8c776a0b76a8c5c7095f4083ad6993 jdk7u40-b34
 9f74e1f33e6cc89256eb2c61964558460d9d7efe jdk7u40-b35
+b75c19a170c7a1a7b846e4e793e62546b2c54646 jdk7u40-b36
+918e6c87b006e32c80a937c7b0f2f9c65edbecdb jdk7u40-b37
 000becfcb945d8592cfdef6ef1704b532af56762 jdk7u45-b01
 817632baca26f7566e36c7708455494c15113d88 jdk7u45-b02
 f65baba9400aec6cb29bc06b3139623bb4663225 jdk7u45-b03
 80ff2468f520ed1940915815ceb85e05bd2bc568 jdk7u45-b04
-a9036e591b8e39b26fbbc158d8edd5d34cfe893d jdk7u45-b05
-0000000000000000000000000000000000000000 jdk7u45-b05
+1128d3934b643660a219532aa1ca554877d89375 jdk7u45-b05
--- a/THIRD_PARTY_README	Mon Aug 05 11:52:42 2013 -0700
+++ b/THIRD_PARTY_README	Mon Aug 05 13:47:31 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