# HG changeset patch # User asaha # Date 1433449708 25200 # Node ID 67f2485a64d4851e25190a32d91743583dd468c7 # Parent 978a14d575e30e036779492797466adb256bbb16# Parent 3639e38bd73f5efa8ce092f0a745bb0c90759575 Merge diff -r 978a14d575e3 -r 67f2485a64d4 .hgtags --- a/.hgtags Wed Jun 03 20:27:36 2015 -0700 +++ b/.hgtags Thu Jun 04 13:28:28 2015 -0700 @@ -630,6 +630,7 @@ 05c80f1060f0c0d5720de9eadd09162af1168eab jdk8u51-b12 07e103f3f43886a3b47945e5295eb5accad505de jdk8u51-b13 a4eea4bee2d4fdb05f1a8358d70ec6adb1135526 jdk8u51-b14 +9a70cba6a3c3e44486f9c199d03a16b2b09d0a13 jdk8u51-b15 d9349fa8822336e0244da0a8448f3e6b2d62741d jdk8u60-b00 d9349fa8822336e0244da0a8448f3e6b2d62741d hs25.60-b00 ebf89088c08ab0508b9002b48dd3d68a340259af hs25.60-b01 diff -r 978a14d575e3 -r 67f2485a64d4 make/hotspot_version