# HG changeset patch # User asaha # Date 1410468187 25200 # Node ID 56636836cfa155e42584e3880bb2a74135ec113d # Parent b68c022a36dd21d6e1c6bfcfa6df38aebae98af2# Parent 7ebfc4557ca56dbe4deba73a89ea599cc7b47298 Merge diff -r b68c022a36dd -r 56636836cfa1 .hgtags --- a/.hgtags Mon Sep 08 13:31:45 2014 -0700 +++ b/.hgtags Thu Sep 11 13:43:07 2014 -0700 @@ -501,6 +501,7 @@ 00cf2b6f51b9560b01030e8f4c28c466f0b21fe3 hs25.20-b23 19408d5fd31c25ce60c43dd33e92b96e8df4a4ea jdk8u20-b25 eaa4074a7e3975cd33ec55e6b584586e2ac681bd jdk8u20-b26 +7c9925f21c2529a88eb64b8039cc080f60b85e01 jdk8u20-b31 a4d44dfb7d30eea54bc172e4429a655454ae0bbf jdk8u25-b00 9a2152fbd929b0d8b2f5c326a5526214ae71731a jdk8u25-b01 d3d5604ea0dea3812e87ba76ac199d0a8be6f49f jdk8u25-b02 diff -r b68c022a36dd -r 56636836cfa1 src/share/vm/classfile/verifier.cpp