Merge
authorlana
Thu, 09 Feb 2017 18:16:09 +0000
changeset 43632 d30aaabb640a
parent 43631 b099d4afdd47 (current diff)
parent 43630 d9ec2cff0795 (diff)
child 43633 bab94741222e
Merge
nashorn/.hgtags
--- a/nashorn/.hgtags	Thu Feb 09 17:21:49 2017 +0000
+++ b/nashorn/.hgtags	Thu Feb 09 18:16:09 2017 +0000
@@ -387,6 +387,7 @@
 2a0437036a64853334e538044eb68d2df70075fa jdk-9+151
 ddc52e72757086a75a54371e8e7f56a3f89f1e55 jdk-9+152
 19aaaf2d02b7d6986538cd9a8c46901ecb50eebf jdk-9+153
+a84b49cfee63716975535abae2865ffef4dd6474 jdk-10+0
 a84b49cfee63716975535abae2865ffef4dd6474 jdk-9+154
 f9bb37a817b3cd3b758a60f3c68258a6554eb382 jdk-9+155
 d577398d31111be4bdaa08008247cf4242eaea94 jdk-9+156
--- a/nashorn/.jcheck/conf	Thu Feb 09 17:21:49 2017 +0000
+++ b/nashorn/.jcheck/conf	Thu Feb 09 18:16:09 2017 +0000
@@ -1,1 +1,1 @@
-project=jdk9
+project=jdk10