Merge

Mon, 01 Dec 2014 11:39:34 -0800

author
asaha
date
Mon, 01 Dec 2014 11:39:34 -0800
changeset 2744
d4c7822e9d64
parent 2743
e2c6204e7ed1
parent 2669
c22d0e2868be
child 2745
244e6dc77287

Merge

.hgtags file | annotate | diff | comparison | revisions
     1.1 --- a/.hgtags	Wed Nov 19 16:25:39 2014 -0800
     1.2 +++ b/.hgtags	Mon Dec 01 11:39:34 2014 -0800
     1.3 @@ -342,6 +342,9 @@
     1.4  2deb2110e81fc38f5b45842fd478aae168d2d27a jdk8u31-b05
     1.5  fe1980c653be1fa9fb50353c5a5305855dcd7bd4 jdk8u31-b06
     1.6  03b8ef4cf0c00aa040db27c7d8e68fa8b6133afd jdk8u31-b07
     1.7 +05824e9d8171e3d50fd5d1a495169cb38b64cf08 jdk8u31-b08
     1.8 +26c46688ce4a0909f65dc341df4315bf34a92202 jdk8u31-b09
     1.9 +99c3209f228e1f9aa874b6bd0908fd5d9ebf7078 jdk8u31-b10
    1.10  d231957fe3103e790465fcf058fb8cb33bbc4c4e jdk8u40-b00
    1.11  bf89a471779d13a9407f7d1c86f7716258bc4aa6 jdk8u40-b01
    1.12  0b6cc4ea670f5d17b56c088f202869bdbb80a5ce jdk8u40-b02
    1.13 @@ -358,4 +361,5 @@
    1.14  88ce114c6adc387dc7fc5831b8263f152f0412fb jdk8u40-b13
    1.15  f18c5b47f27b387d94487890684abe5a554b0d9b jdk8u40-b14
    1.16  682a6c1aefd766eaf774ffeb1207a5189edf94d6 jdk8u40-b15
    1.17 +74c51ff270c51d17732250411fe9cd5392bc925e jdk8u40-b16
    1.18  dbae37f50c43453f7d6f22d96adc8b5b6cd1e90d jdk8u45-b00
     2.1 --- a/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties	Wed Nov 19 16:25:39 2014 -0800
     2.2 +++ b/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties	Mon Dec 01 11:39:34 2014 -0800
     2.3 @@ -1534,7 +1534,7 @@
     2.4  compiler.warn.override.unchecked.thrown={0}\n\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3055\u308C\u305F\u30E1\u30BD\u30C3\u30C9\u306F{1}\u3092\u30B9\u30ED\u30FC\u3057\u307E\u305B\u3093
     2.5  
     2.6  # 0: symbol
     2.7 -compiler.warn.override.equals.but.not.hashcode=\u30AF\u30E9\u30B9{0}\u306F\u7B49\u53F7\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u3059\u304C\u3001\u3053\u306E\u30AF\u30E9\u30B9\u3082\u30B9\u30FC\u30D1\u30FC\u30AF\u30E9\u30B9\u3082hashCode\u30E1\u30BD\u30C3\u30C9\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u305B\u3093
     2.8 +compiler.warn.override.equals.but.not.hashcode=\u30AF\u30E9\u30B9{0}\u306Fequals\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u3059\u304C\u3001\u3053\u306E\u30AF\u30E9\u30B9\u3082\u3001\u307E\u305F\u3001\u3044\u304B\u306A\u308B\u30B9\u30FC\u30D1\u30FC\u30AF\u30E9\u30B9\u3082\u3001hashCode\u30E1\u30BD\u30C3\u30C9\u3092\u30AA\u30FC\u30D0\u30FC\u30E9\u30A4\u30C9\u3057\u307E\u305B\u3093
     2.9  
    2.10  ## The following are all possible strings for the first argument ({0}) of the
    2.11  ## above strings.
     3.1 --- a/src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties	Wed Nov 19 16:25:39 2014 -0800
     3.2 +++ b/src/share/classes/com/sun/tools/javac/resources/compiler_zh_CN.properties	Mon Dec 01 11:39:34 2014 -0800
     3.3 @@ -1534,7 +1534,7 @@
     3.4  compiler.warn.override.unchecked.thrown={0}\n\u88AB\u8986\u76D6\u7684\u65B9\u6CD5\u672A\u629B\u51FA{1}
     3.5  
     3.6  # 0: symbol
     3.7 -compiler.warn.override.equals.but.not.hashcode=\u7C7B{0}\u8986\u76D6\u4E86\u7B49\u53F7, \u4F46\u8BE5\u7C7B\u6216\u4EFB\u4F55\u8D85\u7C7B\u90FD\u672A\u8986\u76D6 hashCode \u65B9\u6CD5
     3.8 +compiler.warn.override.equals.but.not.hashcode=\u7C7B{0}\u8986\u76D6\u4E86 equals, \u4F46\u8BE5\u7C7B\u6216\u4EFB\u4F55\u8D85\u7C7B\u90FD\u672A\u8986\u76D6 hashCode \u65B9\u6CD5
     3.9  
    3.10  ## The following are all possible strings for the first argument ({0}) of the
    3.11  ## above strings.

mercurial