# HG changeset patch
# User lana
# Date 1415315588 28800
# Node ID d34febeff13b41504a8c5c65514f14b943148f8e
# Parent  0331487788ba0358675f4cdce817faa44e7b4da4# Parent  5a251d0063d1e52ef5f9dadec16d70af3c601573
Merge

diff -r 5a251d0063d1 -r d34febeff13b nashorn/.hgtags
--- a/nashorn/.hgtags	Thu Nov 06 17:06:56 2014 +0100
+++ b/nashorn/.hgtags	Thu Nov 06 15:13:08 2014 -0800
@@ -271,3 +271,4 @@
 63b8da4c958c3bbadfff082c547983f5daa50c0f jdk9-b35
 10fe62bc188476abb025e55f55128cbfecf24584 jdk9-b36
 dd7bbdf81a537106cfa9227d1a9a57849cb26b4d jdk9-b37
+365f55e7b3c45637bf912c88d31b32a127ad7429 jdk9-b38