hg: jdk9/sandbox/hotspot: Merge

erik.joelsson at oracle.com erik.joelsson at oracle.com
Tue Mar 22 10:40:34 UTC 2016


Changeset: 0105bead1599
Author:    erikj
Date:      2016-03-21 17:25 +0100
URL:       http://hg.openjdk.java.net/jdk9/sandbox/hotspot/rev/0105bead1599

Merge

! make/lib/Lib-jdk.hotspot.agent.gmk
! make/test/JtregNative.gmk
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/development/Server16.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/development/Server24.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/general/About16.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/general/About24.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/general/Delete16.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/general/Delete24.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/general/Find16.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/general/Help16.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/general/Help24.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/general/History16.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/general/History24.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/general/Information16.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/general/Information24.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/general/New16.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/general/New24.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/general/Open16.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/general/Open24.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/general/Save24.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/general/SaveAs16.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/general/SaveAs24.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/general/Zoom16.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/general/ZoomIn16.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/general/ZoomIn24.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/navigation/Down16.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/navigation/Up16.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/text/AlignCenter16.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/text/AlignCenter24.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/text/AlignLeft16.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/text/AlignLeft24.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/text/AlignRight16.gif
- src/jdk.hotspot.agent/share/classes/images/toolbarButtonGraphics/text/AlignRight24.gif
- src/share/vm/gc/g1/concurrentMark.cpp
- src/share/vm/gc/g1/concurrentMark.hpp
- src/share/vm/gc/g1/concurrentMark.inline.hpp
- src/share/vm/jvmci/commandLineFlagConstraintsJVMCI.cpp
- src/share/vm/jvmci/commandLineFlagConstraintsJVMCI.hpp
- test/compiler/compilercontrol/jcmd/StressAddSequentiallyTest.java



More information about the jdk9-sandbox-changes mailing list