Mercurial > hg > release > icedtea8-forest-3.0 > corba
changeset 1104:5b6ff67eed5f jdk8u65-b05
Merge
author | asaha |
---|---|
date | Thu, 09 Jul 2015 22:43:38 -0700 |
parents | a78046a9145a (current diff) 79767a9d96b7 (diff) |
children | cd1b3e5a3126 |
files | .hgtags |
diffstat | 2 files changed, 7 insertions(+), 35 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Mon Jul 06 12:23:57 2015 -0700 +++ b/.hgtags Thu Jul 09 22:43:38 2015 -0700 @@ -423,6 +423,7 @@ 1fbfa02e524872a75e98ee3a80e2472fa7012fde jdk8u51-b14 d6e1f914c954f98caa31edd0037837830774dfb6 jdk8u51-b15 3b9b39af6c36216418b78c449dd3af17b865a952 jdk8u51-b16 +5980dad8f264bb5ec3982d64a7c0af86fc5b3d16 jdk8u51-b31 8bbc2bb414b7e9331c2014c230553d72c9d161c5 jdk8u60-b00 15ae8298b34beb30f2bd7baa7ff895af2bec13f6 jdk8u60-b01 a98524c04cbd24bbc3029b21c033abf9108e92b4 jdk8u60-b02 @@ -445,6 +446,8 @@ eb0caffe34c6bea2ff40966757142b3dcd3a2a4c jdk8u60-b19 4f3a29adbf4cfa2127e1108d82aaaa0d29f3c583 jdk8u60-b20 d68de92de3bad991546b11d77de6e9c17edf7ec2 jdk8u60-b21 +3a04901d83880634ecd70c8be992189228ccd746 jdk8u60-b22 +0828bb6521738ad5a7fe11f0aa3495465f002848 jdk8u60-b23 8e247b5216a5a4623c1bef7331585d78e7c0fb15 jdk8u52-b06 974e2fd9b5b3cec38cceb35c93bcc3b5bedbe91c jdk8u52-b07 8e247b5216a5a4623c1bef7331585d78e7c0fb15 jdk8u65-b00
--- a/THIRD_PARTY_README Mon Jul 06 12:23:57 2015 -0700 +++ b/THIRD_PARTY_README Thu Jul 09 22:43:38 2015 -0700 @@ -1140,37 +1140,6 @@ -------------------------------------------------------------------------------- -%% This notice is provided with respect to JSON, which may be included -with JRE 8 & JDK 8. - ---- begin of LICENSE --- - -Copyright (c) 2002 JSON.org - -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 shall be used for Good, not Evil. - -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 --- - -------------------------------------------------------------------------------- - %% This notice is provided with respect to Kerberos functionality, which which may be included with JRE 8, JDK 8, and OpenJDK 8. @@ -1250,7 +1219,7 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to libpng 1.6.16, which may be +%% This notice is provided with respect to libpng 1.6.16, which may be included with JRE 8, JDK 8, and OpenJDK 8. --- begin of LICENSE --- @@ -1370,7 +1339,7 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to libungif 4.1.3, which may be +%% This notice is provided with respect to GIFLIB 5.1.1 & libungif 4.1.3, which may be included with JRE 8, JDK 8, and OpenJDK 8. --- begin of LICENSE --- @@ -1399,13 +1368,13 @@ ------------------------------------------------------------------------------- -%% This notice is provided with respect to Little CMS 2.5, which may be +%% This notice is provided with respect to Little CMS 2.7, which may be included with JRE 8, JDK 8, and OpenJDK 8. --- begin of LICENSE --- Little CMS -Copyright (c) 1998-2011 Marti Maria Saguer +Copyright (c) 1998-2015 Marti Maria Saguer Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal