Mercurial Mercurial > jdk-sandbox / changeset
summary | shortlog | changelog | graph | tags | bookmarks | branches | files | changeset | raw | help
Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
authorlana
Mon, 20 Dec 2010 21:10:57 -0800
changeset 7644 00e80d00deea
parent 7613 b2cad9e81440 (diff)
parent 7643 a067a0cda531 (current diff)
child 7645 1cdc1b4b6855
Merge
langtools/src/share/classes/com/sun/tools/apt/main/JavaCompiler.java file | annotate | diff | comparison | revisions
langtools/src/share/classes/com/sun/tools/doclets/formats/html/StylesheetWriter.java file | annotate | diff | comparison | revisions
langtools/src/share/classes/com/sun/tools/doclets/internal/toolkit/util/SourceToHTMLConverter.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/diags/examples/VarargsFilename.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/diags/examples/VarargsFilenameAdditional.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/diags/examples/VarargsPlural/VarargsFilename.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/diags/examples/VarargsPlural/VarargsPlural.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/diags/examples/VarargsPluralAdditional/VarargsFilename.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/diags/examples/VarargsPluralAdditional/VarargsPlural.java file | annotate | diff | comparison | revisions
langtools/test/tools/javac/diags/examples/VarargsPluralAdditional/VarargsPluralAdditional.java file | annotate | diff | comparison | revisions 
--- a/langtools/.hgtags	Mon Dec 13 15:11:00 2010 -0800
+++ b/langtools/.hgtags	Mon Dec 20 21:10:57 2010 -0800
@@ -96,3 +96,4 @@
 814561077c448292f78de461b6de5d78d57c2089 jdk7-b119
 1dd813a529cfa06d850ee7dc42da42efb8f6af0e jdk7-b120
 1bf969e9792f977a8593496681539840a54fe644 jdk7-b121
+11e7b4c0476e4d6085d8d28c4aa2833d46714a2a jdk7-b122
--- a/langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.properties	Mon Dec 13 15:11:00 2010 -0800
+++ b/langtools/src/share/classes/com/sun/tools/doclets/formats/html/resources/standard_zh_CN.properties	Mon Dec 20 21:10:57 2010 -0800
@@ -130,7 +130,7 @@
 doclet.Standard_doclet_invoked=\u5df2\u8c03\u7528\u7684\u6807\u51c6 doclet...
 doclet.No_Non_Deprecated_Classes_To_Document=\u627e\u4e0d\u5230\u53ef\u4ee5\u6587\u6863\u5316\u7684\u672a\u8fc7\u65f6\u7684\u7c7b\u3002
 doclet.Interfaces_Italic=\u63a5\u53e3\uff08\u659c\u4f53\uff09
-doclet.Enclosing_Class=\u6b63\u5728\u5c01\u95ed\u7c7b\uff1a
+doclet.Enclosing_Class=\u5305\u5bb9\u7c7b\uff1a
 doclet.Enclosing_Interface=\u6b63\u5728\u5c01\u95ed\u63a5\u53e3\uff1a
 doclet.Help_title=API \u5e2e\u52a9
 doclet.Window_Help_title=API \u5e2e\u52a9
jdk-sandbox