changeset 5818:9f9179e8f0cf hs25-b70

Merge
author amurillo
date Mon, 03 Mar 2014 17:48:02 -0800
parents 5380dc5d007e (diff) e46f2ee62e78 (current diff)
children 0c94c41dcd70
files
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Mon Mar 03 16:10:26 2014 -0800
+++ b/.hgtags	Mon Mar 03 17:48:02 2014 -0800
@@ -415,3 +415,8 @@
 c8218f1072a0370f3ce4714469ced0613ee543ab jdk8-b126
 d45454002494d147c0761e6b37d8a73064f3cf92 hs25-b68
 32f017489ba5dd1bedabb9fa1d26bcc74d0a72b6 hs25-b69
+35038da7bb9ddd367a0a6bf926dfb281aee1d554 jdk8-b127
+874c0b4a946c362bbf20d37c2a564b39093152e6 jdk8-b128
+cb39165c4a65bbff8db356df411e762f9e5423b8 jdk8-b129
+1dbaf664a611e5d9cab6d1be42537b67d0d05f94 jdk8-b130
+b5e7ebfe185cb4c2eeb8a919025fc6a26be2fcef jdk8-b131
--- a/THIRD_PARTY_README	Mon Mar 03 16:10:26 2014 -0800
+++ b/THIRD_PARTY_README	Mon Mar 03 17:48:02 2014 -0800
@@ -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 ---