Merge jdk8u202-b06

Wed, 05 Dec 2018 11:24:22 +0000

author
aefimov
date
Wed, 05 Dec 2018 11:24:22 +0000
changeset 3773
0bab06166b75
parent 3770
74d8d07eaad9
parent 3772
4fbee4ebd4d3
child 3774
89bf1a09ea36

Merge

THIRD_PARTY_README file | annotate | diff | comparison | revisions
     1.1 --- a/THIRD_PARTY_README	Fri Nov 30 12:11:49 2018 +0000
     1.2 +++ b/THIRD_PARTY_README	Wed Dec 05 11:24:22 2018 +0000
     1.3 @@ -1668,13 +1668,13 @@
     1.4  
     1.5  -------------------------------------------------------------------------------
     1.6  
     1.7 -%% This notice is provided with respect to Little CMS 2.7, which may be 
     1.8 +%% This notice is provided with respect to Little CMS 2.9, which may be
     1.9  included with JRE 8, JDK 8, and OpenJDK 8.
    1.10  
    1.11  --- begin of LICENSE ---
    1.12  
    1.13  Little CMS
    1.14 -Copyright (c) 1998-2015 Marti Maria Saguer
    1.15 +Copyright (c) 1998-2011 Marti Maria Saguer
    1.16  
    1.17  Permission is hereby granted, free of charge, to any person obtaining a copy
    1.18  of this software and associated documentation files (the "Software"), to deal
     2.1 --- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties	Fri Nov 30 12:11:49 2018 +0000
     2.2 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties	Wed Dec 05 11:24:22 2018 +0000
     2.3 @@ -84,7 +84,7 @@
     2.4  doclet.Constructor_Summary=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u30B5\u30DE\u30EA\u30FC
     2.5  doclet.Method_Summary=\u30E1\u30BD\u30C3\u30C9\u306E\u30B5\u30DE\u30EA\u30FC
     2.6  doclet.Interfaces=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
     2.7 -doclet.Enums=\u5217\u6319\u578B
     2.8 +doclet.Enums=\u5217\u6319
     2.9  doclet.AnnotationTypes=\u6CE8\u91C8\u578B
    2.10  doclet.Exceptions=\u4F8B\u5916
    2.11  doclet.Errors=\u30A8\u30E9\u30FC
    2.12 @@ -102,9 +102,9 @@
    2.13  doclet.AnnotationType=\u6CE8\u91C8\u578B
    2.14  doclet.annotationtype=\u6CE8\u91C8\u578B
    2.15  doclet.annotationtypes=\u6CE8\u91C8\u578B
    2.16 -doclet.Enum=\u5217\u6319\u578B
    2.17 -doclet.enum=\u5217\u6319\u578B
    2.18 -doclet.enums=\u5217\u6319\u578B
    2.19 +doclet.Enum=\u5217\u6319
    2.20 +doclet.enum=\u5217\u6319
    2.21 +doclet.enums=\u5217\u6319
    2.22  doclet.interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
    2.23  doclet.interfaces=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
    2.24  doclet.class=\u30AF\u30E9\u30B9
     3.1 --- a/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties	Fri Nov 30 12:11:49 2018 +0000
     3.2 +++ b/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties	Wed Dec 05 11:24:22 2018 +0000
     3.3 @@ -1482,7 +1482,7 @@
     3.4  
     3.5  compiler.misc.kindname.constructor=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
     3.6  
     3.7 -compiler.misc.kindname.enum=\u5217\u6319\u578B
     3.8 +compiler.misc.kindname.enum=\u5217\u6319
     3.9  
    3.10  compiler.misc.kindname.interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
    3.11  

mercurial