changeset 944:6c4058e6adaf

Merge from upstream.
author Roman Kennke <rkennke@redhat.com>
date Wed, 19 Mar 2014 21:09:11 +0100
parents f65f1b6cf0a4 (current diff) 1773f1fd0fac (diff)
children fc41675cd5ad
files
diffstat 2 files changed, 7 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Jan 27 09:56:33 2014 +0100
+++ b/.hgtags	Wed Mar 19 21:09:11 2014 +0100
@@ -248,3 +248,9 @@
 790bbd46b2015e69ce301dae194c2b4141011f2d jdk8-b124
 790bbd46b2015e69ce301dae194c2b4141011f2d jdk8-b125
 9ccce5bf1b0ea0d3f3fb871be069f305f9cea530 jdk8-b126
+2e2ffb9e4b690c63b32142861177390e0f2c40e9 jdk8-b127
+101e42de46869e6604fbf095e1666fbf07fcb93c jdk8-b128
+1e5fe865491300cd0c63261ecf8d34e621e1345c jdk8-b129
+839546caab1285c7699a9c2aa1467f57c9ea7f30 jdk8-b130
+0c38dfecab2ad9f9b5b5edf54b991602147cd040 jdk8-b131
+2a8f4c022aa03e7916223f3291517dbcc38e07cd jdk8-b132
--- a/THIRD_PARTY_README	Mon Jan 27 09:56:33 2014 +0100
+++ b/THIRD_PARTY_README	Wed Mar 19 21:09:11 2014 +0100
@@ -1400,7 +1400,7 @@
 -------------------------------------------------------------------------------
 
 %% This notice is provided with respect to Little CMS 2.4, which may be 
-included with OpenJDK 8.
+included with JRE 8, JDK 8, and OpenJDK 8.
 
 --- begin of LICENSE ---