hg: amber/amber: manual merge

maurizio.cimadamore at oracle.com maurizio.cimadamore at oracle.com
Tue Sep 26 13:48:51 UTC 2017


Changeset: 2bfeb6356588
Author:    mcimadamore
Date:      2017-09-26 14:45 +0100
URL:       http://hg.openjdk.java.net/amber/amber/rev/2bfeb6356588

manual merge

! src/jdk.compiler/share/classes/com/sun/tools/javac/code/Source.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/comp/Attr.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/parser/JavacParser.java
! src/jdk.compiler/share/classes/com/sun/tools/javac/resources/compiler.properties
! src/jdk.compiler/share/classes/com/sun/tools/javac/util/Names.java
- src/jdk.jshell/share/classes/jdk/jshell/VarTypePrinter.java
+ test/langtools/tools/javac/lvti/SelfRefTest.java
+ test/langtools/tools/javac/lvti/SelfRefTest.out



More information about the amber-dev mailing list