aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorasaha <none@none>2014-01-30 13:58:45 -0800
committerasaha <none@none>2014-01-30 13:58:45 -0800
commit15c04192d219dbdbf270bae5f682120c0204ea01 (patch)
tree573f470e5a2c748977f1e22acc8df18cf9f443c5
parent7b7951b52871b72b8ecdfea016ef2607db51e26f (diff)
parent59ea195425ee5d1919946d189930f37e2c8e8dab (diff)
Merge
-rw-r--r--.hgtags1
-rw-r--r--THIRD_PARTY_README2
2 files changed, 2 insertions, 1 deletions
diff --git a/.hgtags b/.hgtags
index 79d5350..f9d3ee9 100644
--- a/.hgtags
+++ b/.hgtags
@@ -248,6 +248,7 @@ ff1478785e43718146ffbce97e007f39c3bcaa32 jdk8-b123
790bbd46b2015e69ce301dae194c2b4141011f2d jdk8-b124
790bbd46b2015e69ce301dae194c2b4141011f2d jdk8-b125
9ccce5bf1b0ea0d3f3fb871be069f305f9cea530 jdk8-b126
+2e2ffb9e4b690c63b32142861177390e0f2c40e9 jdk8-b127
c41935d79b8744af8b7b56cd4d4ab781027fb22e jdk8u5-b01
6f3357d3dbf83c1ef0098bcb853e3aa3b26f4cb8 jdk8u5-b02
794b4365b6884e9a15f0840792539f5821814127 jdk8u5-b03
diff --git a/THIRD_PARTY_README b/THIRD_PARTY_README
index ba48858..a93b35b 100644
--- a/THIRD_PARTY_README
+++ b/THIRD_PARTY_README
@@ -1400,7 +1400,7 @@ THE SOFTWARE.
-------------------------------------------------------------------------------
%% 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 ---