Thu, 09 Jul 2015 22:43:38 -0700
Merge
.hgtags | file | annotate | diff | comparison | revisions |
1.1 --- a/.hgtags Mon Jul 06 12:23:57 2015 -0700 1.2 +++ b/.hgtags Thu Jul 09 22:43:38 2015 -0700 1.3 @@ -423,6 +423,7 @@ 1.4 1fbfa02e524872a75e98ee3a80e2472fa7012fde jdk8u51-b14 1.5 d6e1f914c954f98caa31edd0037837830774dfb6 jdk8u51-b15 1.6 3b9b39af6c36216418b78c449dd3af17b865a952 jdk8u51-b16 1.7 +5980dad8f264bb5ec3982d64a7c0af86fc5b3d16 jdk8u51-b31 1.8 8bbc2bb414b7e9331c2014c230553d72c9d161c5 jdk8u60-b00 1.9 15ae8298b34beb30f2bd7baa7ff895af2bec13f6 jdk8u60-b01 1.10 a98524c04cbd24bbc3029b21c033abf9108e92b4 jdk8u60-b02 1.11 @@ -445,6 +446,8 @@ 1.12 eb0caffe34c6bea2ff40966757142b3dcd3a2a4c jdk8u60-b19 1.13 4f3a29adbf4cfa2127e1108d82aaaa0d29f3c583 jdk8u60-b20 1.14 d68de92de3bad991546b11d77de6e9c17edf7ec2 jdk8u60-b21 1.15 +3a04901d83880634ecd70c8be992189228ccd746 jdk8u60-b22 1.16 +0828bb6521738ad5a7fe11f0aa3495465f002848 jdk8u60-b23 1.17 8e247b5216a5a4623c1bef7331585d78e7c0fb15 jdk8u52-b06 1.18 974e2fd9b5b3cec38cceb35c93bcc3b5bedbe91c jdk8u52-b07 1.19 8e247b5216a5a4623c1bef7331585d78e7c0fb15 jdk8u65-b00
2.1 --- a/THIRD_PARTY_README Mon Jul 06 12:23:57 2015 -0700 2.2 +++ b/THIRD_PARTY_README Thu Jul 09 22:43:38 2015 -0700 2.3 @@ -1140,37 +1140,6 @@ 2.4 2.5 -------------------------------------------------------------------------------- 2.6 2.7 -%% This notice is provided with respect to JSON, which may be included 2.8 -with JRE 8 & JDK 8. 2.9 - 2.10 ---- begin of LICENSE --- 2.11 - 2.12 -Copyright (c) 2002 JSON.org 2.13 - 2.14 -Permission is hereby granted, free of charge, to any person obtaining a copy 2.15 -of this software and associated documentation files (the "Software"), to deal 2.16 -in the Software without restriction, including without limitation the rights 2.17 -to use, copy, modify, merge, publish, distribute, sublicense, and/or sell 2.18 -copies of the Software, and to permit persons to whom the Software is 2.19 -furnished to do so, subject to the following conditions: 2.20 - 2.21 -The above copyright notice and this permission notice shall be included in all 2.22 -copies or substantial portions of the Software. 2.23 - 2.24 -The Software shall be used for Good, not Evil. 2.25 - 2.26 -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR 2.27 -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, 2.28 -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE 2.29 -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER 2.30 -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, 2.31 -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE 2.32 -SOFTWARE. 2.33 - 2.34 ---- end of LICENSE --- 2.35 - 2.36 -------------------------------------------------------------------------------- 2.37 - 2.38 %% This notice is provided with respect to Kerberos functionality, which 2.39 which may be included with JRE 8, JDK 8, and OpenJDK 8. 2.40 2.41 @@ -1250,7 +1219,7 @@ 2.42 2.43 ------------------------------------------------------------------------------- 2.44 2.45 -%% This notice is provided with respect to libpng 1.6.16, which may be 2.46 +%% This notice is provided with respect to libpng 1.6.16, which may be 2.47 included with JRE 8, JDK 8, and OpenJDK 8. 2.48 2.49 --- begin of LICENSE --- 2.50 @@ -1370,7 +1339,7 @@ 2.51 2.52 ------------------------------------------------------------------------------- 2.53 2.54 -%% This notice is provided with respect to libungif 4.1.3, which may be 2.55 +%% This notice is provided with respect to GIFLIB 5.1.1 & libungif 4.1.3, which may be 2.56 included with JRE 8, JDK 8, and OpenJDK 8. 2.57 2.58 --- begin of LICENSE --- 2.59 @@ -1399,13 +1368,13 @@ 2.60 2.61 ------------------------------------------------------------------------------- 2.62 2.63 -%% This notice is provided with respect to Little CMS 2.5, which may be 2.64 +%% This notice is provided with respect to Little CMS 2.7, which may be 2.65 included with JRE 8, JDK 8, and OpenJDK 8. 2.66 2.67 --- begin of LICENSE --- 2.68 2.69 Little CMS 2.70 -Copyright (c) 1998-2011 Marti Maria Saguer 2.71 +Copyright (c) 1998-2015 Marti Maria Saguer 2.72 2.73 Permission is hereby granted, free of charge, to any person obtaining a copy 2.74 of this software and associated documentation files (the "Software"), to deal