changeset 959:9b16a2748379

Merge
author asaha
date Thu, 30 Jan 2014 13:58:45 -0800
parents f990906fc6b7 101e42de4686
children 7d94d0555a5e
files .hgtags
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Jan 28 14:55:46 2014 -0800
+++ b/.hgtags	Thu Jan 30 13:58:45 2014 -0800
@@ -248,6 +248,7 @@
 790bbd46b2015e69ce301dae194c2b4141011f2d jdk8-b124
 790bbd46b2015e69ce301dae194c2b4141011f2d jdk8-b125
 9ccce5bf1b0ea0d3f3fb871be069f305f9cea530 jdk8-b126
+2e2ffb9e4b690c63b32142861177390e0f2c40e9 jdk8-b127
 c41935d79b8744af8b7b56cd4d4ab781027fb22e jdk8u5-b01
 6f3357d3dbf83c1ef0098bcb853e3aa3b26f4cb8 jdk8u5-b02
 794b4365b6884e9a15f0840792539f5821814127 jdk8u5-b03
--- a/THIRD_PARTY_README	Tue Jan 28 14:55:46 2014 -0800
+++ b/THIRD_PARTY_README	Thu Jan 30 13:58:45 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 ---