# HG changeset patch # User hseigel # Date 1381951572 14400 # Node ID 9e0ef3f026486ee814309686fb1b5ab048f1c7c6 # Parent 042cf42c72bd7fb3e5b50dd88d908985926f5284# Parent d248425bcfe803446b7add16254d772f225dea0a Merge diff -r d248425bcfe8 -r 9e0ef3f02648 src/share/vm/trace/traceEventClasses.xsl --- a/src/share/vm/trace/traceEventClasses.xsl Wed Oct 16 14:32:05 2013 -0400 +++ b/src/share/vm/trace/traceEventClasses.xsl Wed Oct 16 15:26:12 2013 -0400 @@ -23,8 +23,8 @@ --> + - diff -r d248425bcfe8 -r 9e0ef3f02648 src/share/vm/trace/traceEventIds.xsl --- a/src/share/vm/trace/traceEventIds.xsl Wed Oct 16 14:32:05 2013 -0400 +++ b/src/share/vm/trace/traceEventIds.xsl Wed Oct 16 15:26:12 2013 -0400 @@ -23,8 +23,8 @@ --> + - diff -r d248425bcfe8 -r 9e0ef3f02648 src/share/vm/trace/traceTypes.xsl --- a/src/share/vm/trace/traceTypes.xsl Wed Oct 16 14:32:05 2013 -0400 +++ b/src/share/vm/trace/traceTypes.xsl Wed Oct 16 15:26:12 2013 -0400 @@ -23,8 +23,8 @@ --> + -