changeset 2068:f44c10ff4feb

Merge
author asaha
date Mon, 24 Nov 2014 21:27:51 -0800
parents 8b791f448871 f4c6d187d832
children 3bb5eef377cd
files .hgtags
diffstat 2 files changed, 3 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Nov 18 09:01:40 2014 -0800
+++ b/.hgtags	Mon Nov 24 21:27:51 2014 -0800
@@ -537,6 +537,7 @@
 2e1c7e887c37dd702b2d09a00dacbafd79604e8c jdk7u75-b07
 fe8e75540f0990c6ad9d060c2343ef896cb5bc19 jdk7u75-b08
 512d77cd143798615266314c72c00ee32500661c jdk7u75-b09
+d77d44ecfb980610de2c90446fab13910ed2c8d7 jdk7u75-b10
 e77dbc24fcdb5c55f414459798e4c65ed75bf570 jdk7u76-b00
 17aaafb2d1ecb6e2dac5e05cb3198703737e623a jdk7u76-b01
 da47e39ce6680458be011936b89f0946b9587042 jdk7u76-b02
@@ -547,5 +548,6 @@
 b09339e2ca2ac75e5ca29e980eac2e7866e463aa jdk7u76-b07
 23a0bb20d74919861201d0d73cd612cabfd8f1f2 jdk7u76-b08
 853bb5d480cab85c9f9f67ff86f8cb95c31e4885 jdk7u76-b09
+11ca0f4b0c56817f6ad302022e6414aa52582f16 jdk7u76-b10
 bdbe862f8846558c83f8bc15518446ab0495a173 jdk7u79-b00
 
--- a/src/share/classes/com/sun/tools/javac/resources/javac_ja.properties	Tue Nov 18 09:01:40 2014 -0800
+++ b/src/share/classes/com/sun/tools/javac/resources/javac_ja.properties	Mon Nov 24 21:27:51 2014 -0800
@@ -37,7 +37,7 @@
 javac.opt.Xbootclasspath.p=\u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306B\u4ED8\u52A0\u3059\u308B
 javac.opt.Xbootclasspath.a=\u30D6\u30FC\u30C8\u30B9\u30C8\u30E9\u30C3\u30D7\u30FB\u30AF\u30E9\u30B9\u30FB\u30D1\u30B9\u306B\u8FFD\u52A0\u3059\u308B
 javac.opt.endorseddirs=\u63A8\u5968\u898F\u683C\u30D1\u30B9\u306E\u5834\u6240\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B
-javac.opt.extdirs=\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u6E08\u307F\u62E1\u5F35\u6A5F\u80FD\u306E\u5834\u6240\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B
+javac.opt.extdirs=\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u6E08\u62E1\u5F35\u6A5F\u80FD\u306E\u5834\u6240\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3059\u308B
 javac.opt.processorpath=\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5\u3092\u691C\u7D22\u3059\u308B\u4F4D\u7F6E\u3092\u6307\u5B9A\u3059\u308B
 javac.opt.processor=\u5B9F\u884C\u3059\u308B\u6CE8\u91C8\u30D7\u30ED\u30BB\u30C3\u30B5\u306E\u540D\u524D\u3002\u30C7\u30D5\u30A9\u30EB\u30C8\u306E\u691C\u51FA\u51E6\u7406\u3092\u30D0\u30A4\u30D1\u30B9
 javac.opt.proc.none.only=\u6CE8\u91C8\u51E6\u7406\u3084\u30B3\u30F3\u30D1\u30A4\u30EB\u3092\u5B9F\u884C\u3059\u308B\u304B\u3069\u3046\u304B\u3092\u5236\u5FA1\u3057\u307E\u3059\u3002