Mercurial > hg > icedtea8-forest > langtools
changeset 3866:78414f4f0172 icedtea-3.11.0 icedtea-3.12.0pre00
Merge jdk8u201-ga
author | andrew |
---|---|
date | Fri, 15 Feb 2019 06:44:20 +0000 |
parents | 1bc375a53742 (current diff) 689d7755e8c1 (diff) |
children | 26b29f3e117c |
files | .hgtags |
diffstat | 4 files changed, 31 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgtags Thu Jan 24 19:13:06 2019 +0000 +++ b/.hgtags Fri Feb 15 06:44:20 2019 +0000 @@ -971,6 +971,7 @@ c9f44385be7ef07174ef6b907d967c28288d182a icedtea-3.10.0pre01 e910eba1327dd1abab48a85a1b5890524ebf64af jdk8u181-b13 7cfe4a92d1d51c3f6a0477e508338bcd187b520e jdk8u191-b01 +1f33e21011aaeac7e0d567be4e67f8953c42f6e0 jdk8u201-b00 1f33e21011aaeac7e0d567be4e67f8953c42f6e0 jdk8u191-b02 87c55122c89d88cdfd4bf22a0bc9c115429cb78b jdk8u191-b03 249320309c12b00ce2c3c489b031d2cc1c99d265 jdk8u191-b04 @@ -985,6 +986,8 @@ 7036a6fa432ecc31132e6ff3a7ea7529c994fc57 icedtea-3.10.0 7036a6fa432ecc31132e6ff3a7ea7529c994fc57 icedtea-3.11.0pre00 aeb6ac72f4964ed179047a193a1ada67740e0d2b icedtea-3.11.0pre01 +d035a731ab597cffc8e847d46913088273f49f04 jdk8u191-b12 +17bb956bc44ee4b3f8177e9414d0e4dbb56af417 jdk8u191-b26 aee7802a04daf266caadc5742737bdd7d9a17937 jdk8u182-b00 6412528c09e2af2f551b496f455eb2141f20d525 jdk8u192-b00 db3c95ad833530ff6454cf47b9063325902bbb64 jdk8u192-b01 @@ -1000,3 +1003,24 @@ baf29dda8fdc9ffd971e659ac44dbeb37ab98476 jdk8u192-b25 3bf2d872627dbce9fcba73f64b7a158e67e5f46f jdk8u192-b11 abbb38dafbc8db02ea7f3ff22ca249710387c4b2 icedtea-3.11.0pre02 +3eb4c8be649b8772eb0e82ce80366e4625ea3397 jdk8u192-b12 +4bbe353fcc36f1da3ead0c874e15bb649337c183 jdk8u192-b26 +107b71b590ec4cb3f947674c4cac78eb97ad0899 jdk8u181-b31 +46f42ead87aab68740f95a5eb27a09d120853b10 jdk8u181-b32 +0ce50eb7c16fd346a9438fad9c76a2f96f806baf jdk8u181-b33 +de209b077cbca2bdd266b6abbd4d55309186264d jdk8u181-b34 +d0895208bafb94254b51eb6f915d809c055b5685 jdk8u181-b35 +22576f8af4bd380e1b1201ca77f8c2ff1251a221 jdk8u181-b36 +8d841e832cc0cad3182b5bcd662fadb058c516a7 jdk8u181-b37 +30d61da05c3b7cb5bf1437d628a6ce894dd9b371 jdk8u201-b01 +8c18711ab932e0abc015334e0981072dd1197205 jdk8u201-b02 +4a4ded3965b6691d1253e1271387267439f11022 jdk8u201-b03 +a7f48b9dfb8271c4c2d1110be7d9029add38ae1c jdk8u201-b04 +7909abb85562f12136732b785cd49f19c1d72663 jdk8u201-b74 +14d6465af4ec838b123cf8b47cd0c83ca2321ce2 jdk8u201-b05 +5129e794a75f8d098d26036b17e1ce71e2978343 jdk8u201-b75 +772887000640e33b3199f1516e0e0d10f2473cff jdk8u201-b06 +a7a52249333b941367f94f16743ea4c6e004a0f7 jdk8u201-b76 +4fbee4ebd4d32b302367c44f5e63b1bd647490f1 jdk8u201-b07 +dd3348cbc2d0651582fa8ede11c58e6bdd365c61 jdk8u201-b77 +8c8f74830128f0b244d878920df032e704d35eee jdk8u201-b08
--- a/THIRD_PARTY_README Thu Jan 24 19:13:06 2019 +0000 +++ b/THIRD_PARTY_README Fri Feb 15 06:44:20 2019 +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 Thu Jan 24 19:13:06 2019 +0000 +++ b/src/share/classes/com/sun/tools/doclets/internal/toolkit/resources/doclets_ja.properties Fri Feb 15 06:44:20 2019 +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 Thu Jan 24 19:13:06 2019 +0000 +++ b/src/share/classes/com/sun/tools/javac/resources/compiler_ja.properties Fri Feb 15 06:44:20 2019 +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