hg: panama/dev: manual merge with nicl

henry.jen at oracle.com henry.jen at oracle.com
Wed Jun 13 21:32:22 UTC 2018


Changeset: 3838852d2c13
Author:    henryjen
Date:      2018-06-13 14:32 -0700
URL:       http://hg.openjdk.java.net/panama/dev/rev/3838852d2c13

manual merge with nicl

- src/java.base/aix/native/libjsig/jsig.c
! src/java.base/share/classes/java/lang/System.java
! src/java.base/share/classes/jdk/internal/misc/JavaLangAccess.java
- src/java.desktop/macosx/native/libsplashscreen/libpng/zlib.h
- src/java.desktop/share/classes/sun/applet/AppletEvent.java
- src/java.desktop/share/classes/sun/applet/AppletEventMulticaster.java
- src/java.desktop/share/classes/sun/applet/AppletIOException.java
- src/java.desktop/share/classes/sun/applet/AppletIllegalArgumentException.java
- src/java.desktop/share/classes/sun/applet/AppletImageRef.java
- src/java.desktop/share/classes/sun/applet/AppletListener.java
- src/java.desktop/share/classes/sun/applet/AppletMessageHandler.java
- src/java.desktop/share/classes/sun/applet/AppletObjectInputStream.java
- src/java.desktop/share/classes/sun/applet/AppletPanel.java
- src/java.desktop/share/classes/sun/applet/AppletProps.java
- src/java.desktop/share/classes/sun/applet/AppletResourceLoader.java
- src/java.desktop/share/classes/sun/applet/AppletSecurityException.java
- src/java.desktop/share/classes/sun/applet/AppletViewer.java
- src/java.desktop/share/classes/sun/applet/AppletViewerFactory.java
- src/java.desktop/share/classes/sun/applet/AppletViewerPanel.java
- src/java.desktop/share/classes/sun/applet/Main.java
- src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer.java
- src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_de.java
- src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_es.java
- src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_fr.java
- src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_it.java
- src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_ja.java
- src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_ko.java
- src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_pt_BR.java
- src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_sv.java
- src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_zh_CN.java
- src/java.desktop/share/classes/sun/applet/resources/MsgAppletViewer_zh_TW.java
- src/java.desktop/share/classes/sun/print/DialogOnTop.java
- src/java.desktop/share/classes/sun/print/DialogOwner.java
- src/java.sql.rowset/share/classes/javax/sql/rowset/package.html
- src/java.sql.rowset/share/classes/javax/sql/rowset/spi/package.html
- src/jdk.hotspot.agent/share/classes/sun/jvm/hotspot/memory/StringTable.java
- test/hotspot/jtreg/runtime/containers/docker/CPUSetsReader.java
- test/hotspot/jtreg/runtime/containers/docker/Common.java
- test/jdk/java/lang/Thread/StopThrowable.java
- test/jdk/javax/swing/JLayer/8041982/cupanim.gif
- test/jdk/javax/swing/JSlider/4987336/cupanim.gif
- test/jdk/sun/applet/DeprecatedAppletViewer/DeprecatedAppletViewer.java
- test/jdk/sun/applet/TEST.properties



More information about the panama-dev mailing list