Merge
authorlana
Mon, 01 Apr 2013 21:42:15 -0700
changeset 16573 5e63bda2ec36
parent 16545 b2fe7675691c (diff)
parent 16572 4556bb6015d9 (current diff)
child 16574 51c8dbc33017
Merge
langtools/src/share/classes/com/sun/tools/javac/Server.java
langtools/src/share/classes/com/sun/tools/jdeps/resources/jdk.properties
langtools/src/share/classes/javax/lang/model/type/AnnotatedType.java
langtools/test/tools/javac/annotations/repeatingAnnotations/combo/TestCaseGenerator.java
--- a/langtools/.hgtags	Tue Mar 26 12:07:45 2013 -0700
+++ b/langtools/.hgtags	Mon Apr 01 21:42:15 2013 -0700
@@ -204,3 +204,4 @@
 a8227c61768499dac847ea718af6719027c949f2 jdk8-b80
 ed69d087fdfd394491657a28ba9bc58e7849b7db jdk8-b81
 825da6847791994a8f405ee397df9e7fa638a458 jdk8-b82
+22ba3f92d4ae43bbc19793e854171cae2586f644 jdk8-b83