# HG changeset patch # User duke # Date 1499265710 -7200 # Node ID 67875d4f961f2bae798e3651158824853c793c53 # Parent b4c26443dee5dc01b532a527ff2542a158a663f5# Parent 99a6de5eef201a48abd1442b71254630aa31542e Merge diff -r b4c26443dee5 -r 67875d4f961f .hgtags-top-repo --- a/.hgtags-top-repo Thu Oct 02 19:58:32 2008 -0700 +++ b/.hgtags-top-repo Wed Jul 05 16:41:50 2017 +0200 @@ -10,3 +10,4 @@ bb1ef4ee3d2c8cbf43a37d372325a7952be590b9 jdk7-b33 46a989ab932992b2084b946eeb322fa99b9fee6c jdk7-b34 143c1abedb7d3095eff0f9ee5fec9bf48e3490fc jdk7-b35 +4b4f5fea8d7d0743f0c30d91fcd9bf9d96e5d2ad jdk7-b36 diff -r b4c26443dee5 -r 67875d4f961f hotspot/.hgtags --- a/hotspot/.hgtags Thu Oct 02 19:58:32 2008 -0700 +++ b/hotspot/.hgtags Wed Jul 05 16:41:50 2017 +0200 @@ -10,3 +10,4 @@ 585535ec8a14adafa6bfea65d6975e29094c8cec jdk7-b33 5251a9cd8eb8743eee647365bee1c8afdc131556 jdk7-b34 5fa96a5a7e76da7c8dad12486293a0456c2c116c jdk7-b35 +e91159f921a58af3698e6479ea1fc5818da66d09 jdk7-b36 diff -r b4c26443dee5 -r 67875d4f961f hotspot/agent/make/bugspot.bat --- a/hotspot/agent/make/bugspot.bat Thu Oct 02 19:58:32 2008 -0700 +++ b/hotspot/agent/make/bugspot.bat Wed Jul 05 16:41:50 2017 +0200 @@ -1,5 +1,5 @@ REM -REM Copyright 2002-2003 Sun Microsystems, Inc. All Rights Reserved. +REM Copyright 2002-2008 Sun Microsystems, Inc. All Rights Reserved. REM DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. REM REM This code is free software; you can redistribute it and/or modify it diff -r b4c26443dee5 -r 67875d4f961f hotspot/agent/make/build.xml --- a/hotspot/agent/make/build.xml Thu Oct 02 19:58:32 2008 -0700 +++ b/hotspot/agent/make/build.xml Wed Jul 05 16:41:50 2017 +0200 @@ -1,6 +1,6 @@