Merge

Sat, 30 Apr 2011 16:57:18 -0700

author
lana
date
Sat, 30 Apr 2011 16:57:18 -0700
changeset 994
459854f564ed
parent 993
4caf17560ae0
parent 977
8505c91a1f85
child 995
62bc3775d5bb

Merge

     1.1 --- a/.hgignore	Sat Apr 30 11:57:46 2011 +0100
     1.2 +++ b/.hgignore	Sat Apr 30 16:57:18 2011 -0700
     1.3 @@ -1,3 +1,4 @@
     1.4  ^build/
     1.5  ^dist/
     1.6  /nbproject/private/
     1.7 +^.hgtip
     2.1 --- a/.hgtags	Sat Apr 30 11:57:46 2011 +0100
     2.2 +++ b/.hgtags	Sat Apr 30 16:57:18 2011 -0700
     2.3 @@ -113,3 +113,4 @@
     2.4  ed0f7f1f9511db4f9615b1426d22f8b961629275 jdk7-b136
     2.5  a15c9b058ae007d4ccb7e35ce44e4dfa977f090b jdk7-b137
     2.6  53f212bed4f4304dce7f0bf0fa01c998c65bacd6 jdk7-b138
     2.7 +853b6bb99f9b58eb7cf8211c67d3b6e4f1228a3e jdk7-b139
     3.1 --- a/src/share/classes/com/sun/tools/javadoc/resources/javadoc_zh_CN.properties	Sat Apr 30 11:57:46 2011 +0100
     3.2 +++ b/src/share/classes/com/sun/tools/javadoc/resources/javadoc_zh_CN.properties	Sat Apr 30 16:57:18 2011 -0700
     3.3 @@ -43,7 +43,7 @@
     3.4  main.no_source_files_for_package=\u6CA1\u6709\u7A0B\u5E8F\u5305{0}\u7684\u6E90\u6587\u4EF6
     3.5  main.fatal.error=\u81F4\u547D\u9519\u8BEF
     3.6  main.fatal.exception=\u81F4\u547D\u5F02\u5E38\u9519\u8BEF
     3.7 -main.out.of.memory=java.lang.OutOfMemoryError: \u8BF7\u589E\u5927\u5185\u5B58\u3002\n\u4F8B\u5982, \u5BF9\u4E8E JDK \u7ECF\u5178\u6216\u70ED\u70B9 VM, \u8BF7\u589E\u5927\u9009\u9879 -J-Xmx,\n\u4F8B\u5982 -J-Xmx32m\u3002
     3.8 +main.out.of.memory=java.lang.OutOfMemoryError: \u8BF7\u589E\u5927\u5185\u5B58\u3002\n\u4F8B\u5982, \u5BF9\u4E8E JDK \u7ECF\u5178\u6216 HotSpot VM, \u8BF7\u589E\u5927\u9009\u9879 -J-Xmx,\n\u4F8B\u5982 -J-Xmx32m\u3002
     3.9  main.done_in=[\u5728 {0} \u6BEB\u79D2\u5185\u5B8C\u6210]
    3.10  main.doclet_method_must_be_static=\u5728 doclet \u7C7B{0}\u4E2D, \u65B9\u6CD5{1}\u5FC5\u987B\u4E3A\u9759\u6001\u3002
    3.11  main.must_return_int=\u5728 doclet \u7C7B{0}\u4E2D, \u65B9\u6CD5{1}\u5FC5\u987B\u8FD4\u56DE\u6574\u578B\u503C\u3002

mercurial