changeset 794:5edde74a778b

Merge
author asaha
date Thu, 30 Jan 2014 14:41:17 -0800
parents dd4cc4ce2745 (current diff) 7dfde83426d1 (diff)
children 2d9af8fd30cd
files .hgtags
diffstat 2 files changed, 2 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Jan 28 14:56:59 2014 -0800
+++ b/.hgtags	Thu Jan 30 14:41:17 2014 -0800
@@ -236,6 +236,7 @@
 7346abe2ea03134e1aee3b3d0fccb047235bd221 jdk8-b124
 7346abe2ea03134e1aee3b3d0fccb047235bd221 jdk8-b125
 095263db862da23fa04d57c7e93e553831132449 jdk8-b126
+fdfbb745caf0e54775a44e66e39d3025785e0528 jdk8-b127
 13ca8f1a9eba716295fb7d9c2ddad81390931919 jdk8u5-b01
 7e7cb9977a3d1244384ffa454a4890764a07b042 jdk8u5-b02
 2abeb654b57f306f73f3f73bdfa05f93bce2a1f3 jdk8u5-b03
--- a/THIRD_PARTY_README	Tue Jan 28 14:56:59 2014 -0800
+++ b/THIRD_PARTY_README	Thu Jan 30 14:41:17 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 ---