hg: amber/amber: manual merge with default
vicente.romero at oracle.com
vicente.romero at oracle.com
Fri Jun 7 15:02:53 UTC 2019
Changeset: d273dc2ae04b
Author: vromero
Date: 2019-06-07 11:02 -0400
URL: http://hg.openjdk.java.net/amber/amber/rev/d273dc2ae04b
manual merge with default
! src/hotspot/share/classfile/systemDictionary.hpp
! src/hotspot/share/classfile/vmSymbols.hpp
! src/hotspot/share/oops/instanceKlass.cpp
! src/hotspot/share/oops/instanceKlass.hpp
! src/hotspot/share/oops/method.cpp
! src/hotspot/share/oops/method.hpp
- src/java.base/share/lib/security/cacerts
! src/java.compiler/share/classes/javax/lang/model/element/Element.java
! src/java.compiler/share/classes/javax/lang/model/element/TypeElement.java
! src/java.compiler/share/classes/javax/lang/model/element/VariableElement.java
- src/java.desktop/unix/native/libawt_xawt/awt/awt_AWTEvent.h
- src/java.desktop/unix/native/libawt_xawt/awt/awt_Event.h
- src/java.desktop/unix/native/libawt_xawt/awt/awt_Insets.h
- src/java.desktop/windows/native/libawt/windows/awt_Color.h
- src/java.desktop/windows/native/libawt/windows/awt_Rectangle.h
! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/parser/DocCommentParser.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/formats/html/TagletWriterImpl.java
! src/jdk.javadoc/share/classes/jdk/javadoc/internal/doclets/toolkit/util/Utils.java
- test/jdk/javax/accessibility/8197785/AccessibilityBundleMemoryLeakTest.java
More information about the amber-dev
mailing list