aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorasaha <none@none>2014-01-30 14:41:17 -0800
committerasaha <none@none>2014-01-30 14:41:17 -0800
commitbcc261d3773939f52ecfbd5aaaa70dd7419bcc39 (patch)
tree75c450e052b3ad9ee6cd8839c6f1593b831a274d
parente3faa5aa93ec7903bc9824ca8330817d1d09f3a6 (diff)
parentf284f3fdf165fe85e512a1c50bc320088b38a0d2 (diff)
downloadnashorn-bcc261d3773939f52ecfbd5aaaa70dd7419bcc39.tar.gz
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 9e168fde..997bd042 100644
--- a/.hgtags
+++ b/.hgtags
@@ -236,6 +236,7 @@ c3343930c73c58a22c1d58719bb988aeb25a871f jdk8-b119
7346abe2ea03134e1aee3b3d0fccb047235bd221 jdk8-b124
7346abe2ea03134e1aee3b3d0fccb047235bd221 jdk8-b125
095263db862da23fa04d57c7e93e553831132449 jdk8-b126
+fdfbb745caf0e54775a44e66e39d3025785e0528 jdk8-b127
13ca8f1a9eba716295fb7d9c2ddad81390931919 jdk8u5-b01
7e7cb9977a3d1244384ffa454a4890764a07b042 jdk8u5-b02
2abeb654b57f306f73f3f73bdfa05f93bce2a1f3 jdk8u5-b03
diff --git a/THIRD_PARTY_README b/THIRD_PARTY_README
index ba48858c..a93b35b9 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 ---