Thu, 09 Jul 2015 22:48:43 -0700
Merge
.hgtags | file | annotate | diff | comparison | revisions |
1.1 --- a/.hgtags Mon Jul 06 12:25:49 2015 -0700 1.2 +++ b/.hgtags Thu Jul 09 22:48:43 2015 -0700 1.3 @@ -423,6 +423,7 @@ 1.4 4a6824c3fd8d74f83daac1a79952786837a9848c jdk8u51-b14 1.5 dde8e5b2366b9a08d7448c3cef2cabc710cc9da5 jdk8u51-b15 1.6 e465c106bfe3feb6e2887fa512511c894c092dde jdk8u51-b16 1.7 +b189fe14d0f4375961a60d3e8532ca652e1aa592 jdk8u51-b31 1.8 c8b402c28fe51e25f3298e1266f2ae48bda8d3e0 jdk8u60-b00 1.9 7a0dacd12a9e42f581c11edeb51a69af9a8ab16d jdk8u60-b01 1.10 5eb3236cc4a7075baf80fc8a258a1f9612e52cf0 jdk8u60-b02 1.11 @@ -445,6 +446,8 @@ 1.12 5b422975b71def8c5a16a4f303c8fb8b108dc0cf jdk8u60-b19 1.13 1a4b2888aa98ea70aad849e35e05b48e1c107503 jdk8u60-b20 1.14 a414aec2d19cf692310587518546842070b80cb8 jdk8u60-b21 1.15 +6079c26a3b8fa1ead3d26a9de6ade2af71f1fb94 jdk8u60-b22 1.16 +c21563403b7a043be3d8f1afdd314e91438e357c jdk8u60-b23 1.17 b61213045ec6e71505dfb94d2cd4ae3ce866166b jdk8u52-b06 1.18 45891cd5c7a2268c65e9b8ab9299d46c45c77c47 jdk8u52-b07 1.19 b61213045ec6e71505dfb94d2cd4ae3ce866166b jdk8u65-b00
2.1 --- a/THIRD_PARTY_README Mon Jul 06 12:25:49 2015 -0700 2.2 +++ b/THIRD_PARTY_README Thu Jul 09 22:48:43 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