Merge
authorlana
Fri, 28 Jan 2011 10:06:08 -0800
changeset 8050 4b78c27c217f
parent 8030 0074833e36c6 (diff)
parent 8049 6f996a6c9b02 (current diff)
child 8051 85a8fae9d6e0
Merge
langtools/src/share/classes/com/sun/tools/classfile/ExtendedAnnotation.java
langtools/src/share/classes/com/sun/tools/classfile/RuntimeInvisibleTypeAnnotations_attribute.java
langtools/src/share/classes/com/sun/tools/classfile/RuntimeTypeAnnotations_attribute.java
langtools/src/share/classes/com/sun/tools/classfile/RuntimeVisibleTypeAnnotations_attribute.java
langtools/src/share/classes/com/sun/tools/javac/code/TypeAnnotations.java
langtools/src/share/classes/com/sun/tools/javap/TypeAnnotationWriter.java
langtools/test/tools/javac/diags/examples/EnumConstRequired.java
langtools/test/tools/javac/diags/examples/TypeParameterOnPolymorphicSignature.java
langtools/test/tools/javac/meth/InvokeDynTrans.out
langtools/test/tools/javac/meth/InvokeMHTrans.java
langtools/test/tools/javac/meth/InvokeMHTrans.out
--- a/langtools/.hgtags	Mon Jan 24 13:25:42 2011 -0800
+++ b/langtools/.hgtags	Fri Jan 28 10:06:08 2011 -0800
@@ -101,3 +101,4 @@
 4868a36f6fd8972505c466013813eeb28f0482ea jdk7-b124
 4b0560c72b529d4b952924b2da94d8436af79d05 jdk7-b125
 438a8ad60f7ae7aa897663148fd43fe85ef05e5b jdk7-b126
+1e6094c33187f6c3dca55ced3701ee1f9d73a77d jdk7-b127