Merge
authorlana
Tue, 17 Sep 2013 08:21:11 -0700
changeset 19943 669e1adcbf50
parent 19905 dd285b441e44 (diff)
parent 19942 e9dae0e41075 (current diff)
child 19944 b039e3b8701a
Merge
langtools/src/share/classes/com/sun/tools/javac/code/Annotations.java
langtools/test/tools/javac/diags/examples/CyclicInference.java
langtools/test/tools/javac/diags/examples/MrefStat.java.rej
langtools/test/tools/javac/diags/examples/MrefStat1.java.rej
langtools/test/tools/javac/lambda/TargetType10.out
langtools/test/tools/javac/lambda/typeInference/InferenceTest5.java
langtools/test/tools/javac/lambda/typeInference/InferenceTest_neg5.java
langtools/test/tools/javac/lambda/typeInference/InferenceTest_neg5.out
--- a/langtools/.hgtags	Mon Sep 16 14:13:44 2013 +0200
+++ b/langtools/.hgtags	Tue Sep 17 08:21:11 2013 -0700
@@ -228,3 +228,4 @@
 dd4a00c220c6e14d9b2ce93a2bd436a1d04f0d03 jdk8-b104
 375834b5cf086dd7ce9e49f602d81bb51d3e0fa9 jdk8-b105
 fcd768844b9926c5f994292ec6350c20cc7c0f76 jdk8-b106
+3f274927ec1863544b8214262ab02b7de2970da6 jdk8-b107