changeset 3773:0bab06166b75 jdk8u202-b06

Merge
author aefimov
date Wed, 05 Dec 2018 11:24:22 +0000
parents 74d8d07eaad9 4fbee4ebd4d3
children 89bf1a09ea36
files THIRD_PARTY_README
diffstat 3 files changed, 7 insertions(+), 7 deletions(-) [+]
line wrap: on
line diff
--- a/THIRD_PARTY_README	Fri Nov 30 12:11:49 2018 +0000
+++ b/THIRD_PARTY_README	Wed Dec 05 11:24:22 2018 +0000
@@ -1668,13 +1668,13 @@
 
 -------------------------------------------------------------------------------
 
-%% This notice is provided with respect to Little CMS 2.7, which may be 
+%% This notice is provided with respect to Little CMS 2.9, which may be
 included with JRE 8, JDK 8, and OpenJDK 8.
 
 --- begin of LICENSE ---
 
 Little CMS
-Copyright (c) 1998-2015 Marti Maria Saguer
+Copyright (c) 1998-2011 Marti Maria Saguer
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal
--- a/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties	Fri Nov 30 12:11:49 2018 +0000
+++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties	Wed Dec 05 11:24:22 2018 +0000
@@ -84,7 +84,7 @@
 doclet.Constructor_Summary=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF\u306E\u30B5\u30DE\u30EA\u30FC
 doclet.Method_Summary=\u30E1\u30BD\u30C3\u30C9\u306E\u30B5\u30DE\u30EA\u30FC
 doclet.Interfaces=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
-doclet.Enums=\u5217\u6319\u578B
+doclet.Enums=\u5217\u6319
 doclet.AnnotationTypes=\u6CE8\u91C8\u578B
 doclet.Exceptions=\u4F8B\u5916
 doclet.Errors=\u30A8\u30E9\u30FC
@@ -102,9 +102,9 @@
 doclet.AnnotationType=\u6CE8\u91C8\u578B
 doclet.annotationtype=\u6CE8\u91C8\u578B
 doclet.annotationtypes=\u6CE8\u91C8\u578B
-doclet.Enum=\u5217\u6319\u578B
-doclet.enum=\u5217\u6319\u578B
-doclet.enums=\u5217\u6319\u578B
+doclet.Enum=\u5217\u6319
+doclet.enum=\u5217\u6319
+doclet.enums=\u5217\u6319
 doclet.interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
 doclet.interfaces=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9
 doclet.class=\u30AF\u30E9\u30B9
--- a/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties	Fri Nov 30 12:11:49 2018 +0000
+++ b/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties	Wed Dec 05 11:24:22 2018 +0000
@@ -1482,7 +1482,7 @@
 
 compiler.misc.kindname.constructor=\u30B3\u30F3\u30B9\u30C8\u30E9\u30AF\u30BF
 
-compiler.misc.kindname.enum=\u5217\u6319\u578B
+compiler.misc.kindname.enum=\u5217\u6319
 
 compiler.misc.kindname.interface=\u30A4\u30F3\u30BF\u30D5\u30A7\u30FC\u30B9