Merge
authorlana
Fri, 04 Nov 2016 17:52:11 +0000
changeset 41939 4e7ef9667ea6
parent 41930 394bc7b2237f (diff)
parent 41938 8e66bf10fcec (current diff)
child 41940 048d559e9da7
Merge
langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/EditPad.java
langtools/src/jdk.jshell/share/classes/jdk/internal/jshell/tool/ExternalEditor.java
langtools/test/jdk/jshell/EditorPadTest.java
langtools/test/tools/javac/diags/examples/CantFindModule/CantFindModule.java
langtools/test/tools/javac/diags/examples/XaddexportsMalformedEntry.java
langtools/test/tools/javac/diags/examples/XaddexportsTooMany.java
langtools/test/tools/javac/diags/examples/XaddreadsMalformedEntry.java
langtools/test/tools/javac/diags/examples/XaddreadsTooMany.java
--- a/langtools/.hgtags	Thu Nov 03 13:59:15 2016 -0700
+++ b/langtools/.hgtags	Fri Nov 04 17:52:11 2016 +0000
@@ -385,3 +385,4 @@
 6842e63d6c3971172214b411f29965852ca175d1 jdk-9+140
 296c875051187918f8f3f87e9432036d13013d39 jdk-9+141
 d245e56f4a79a8a8d18bd143c08f079ee98ab638 jdk-9+142
+6ef8a1453577832626b0efb7f70a3102b721ebbf jdk-9+143