Changeset: b72d70f33ee4 Author: jgodinez Date: 2011-05-09 12:34 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/b72d70f33ee4
Merge - test/tools/javac/generics/diamond/7030150/Neg01.java - test/tools/javac/generics/diamond/7030150/Neg01.out - test/tools/javac/generics/diamond/7030150/Neg02.java - test/tools/javac/generics/diamond/7030150/Neg02.out - test/tools/javac/generics/diamond/7030150/Neg03.java - test/tools/javac/generics/diamond/7030150/Neg03.out - test/tools/javac/generics/diamond/7030150/Pos01.java - test/tools/javac/generics/diamond/7030150/Pos02.java Changeset: 66956f601f5a Author: mfang Date: 2011-05-10 15:04 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/66956f601f5a 7022005: [ja,zh_CN] javadoc, part of navigation bar in generated html are not translated. Reviewed-by: yhuang ! src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_ja.properties ! src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.properties Changeset: c60f85f28aa9 Author: mfang Date: 2011-05-10 15:07 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/c60f85f28aa9 7043548: message drop 3 translation integration Reviewed-by: yhuang ! src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties ! src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties ! src/share/classes/com/sun/tools/javac/resources/javac_ja.properties ! src/share/classes/com/sun/tools/javac/resources/javac_zh_CN.properties ! src/share/classes/com/sun/tools/javadoc/resources/javadoc_ja.properties ! src/share/classes/com/sun/tools/javadoc/resources/javadoc_zh_CN.properties Changeset: 7476b164194c Author: mfang Date: 2011-05-10 19:58 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/7476b164194c Merge Changeset: 4d05949f8d6b Author: schien Date: 2011-05-12 17:17 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/4d05949f8d6b Added tag jdk7-b142 for changeset 7476b164194c ! .hgtags Changeset: 652f0daf74a7 Author: lana Date: 2011-05-14 11:29 -0700 URL: http://hg.openjdk.java.net/jdk7/tl/langtools/rev/652f0daf74a7 Merge
