Mercurial > hg > release > icedtea8-forest-3.0 > jaxp

changeset 1310:5059e76bf65c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merge
author asaha
date Wed, 02 Dec 2015 23:17:53 -0800
parents 2beb3ddba0d7 (current diff) 0b734f331213 (diff)
children 8c68f448ec4a
files .hgtags
diffstat 3 files changed, 16 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Thu Oct 29 17:44:24 2015 -0700
+++ b/.hgtags	Wed Dec 02 23:17:53 2015 -0800
@@ -429,6 +429,7 @@
 4519799749671cef69091e354b7cd52496f6d970 jdk8u51-b31
 975b01e6be932672edd527f6efe4b430d7bcf07a jdk8u51-b32
 59aea46232797f247aab869d751e4b8090eb4789 jdk8u51-b33
+55657ee85e8e4157836bb4b748d76234b1360e95 jdk8u51-b34
 3b73732d6886dc8155f0c1fbb125ca60d9e2fd2b jdk8u60-b00
 b0e15cd169a93080c4e30e9eb3061d0b329bf38c jdk8u60-b01
 0b64e727bdb06c82caa02ef25ac2552ce3314537 jdk8u60-b02
@@ -497,8 +498,11 @@
 25cf8ddfc8bf163211d1dfd79f31765cac58eef5 jdk8u66-b15
 40ce5a6d733d44d93cbd5c0105a820ad7a7f4754 jdk8u66-b16
 fc348901e958842a757d59c6b35846d13ab86793 jdk8u66-b17
+4ae0c2d6dd24931f3f271e645221e5331e351c00 jdk8u66-b18
 8af7da6c13af3c95bc9933e6d1e0d83648f6c0ae jdk8u66-b31
 1db6026e38d41f217bcbe2b619711b850c1788f4 jdk8u66-b32
+a85030db026108135a95b86c343280ed7bda322a jdk8u66-b33
+59dc259db9ad7d7eaa98b9540734bd5c22d9bc86 jdk8u66-b34
 700dc6c623439c5df98253fba49387919dd8732d jdk8u71-b00
 f13e36a4ac819281990312f13f156dbb6f913371 jdk8u71-b01
 90bca51fcdaa065b823ece61e4b0af1ad81955e5 jdk8u71-b02
@@ -506,6 +510,11 @@
 28922f863973b2dc0c87b767685958ec7fc13b97 jdk8u71-b04
 6c783cdd685f6fc8bbc25e4debb07c2096f7b64a jdk8u71-b05
 ae391e3b725697f17e739eaf6b669af10c54ed28 jdk8u71-b06
+5cadfe102e5c7fa1d5ea37991a3e7fc0337e7fab jdk8u71-b07
+6efaec82e8da45264718ce9391bc02f196da63a0 jdk8u71-b08
+19185d4e00661de65f3707328b014e3a011f5456 jdk8u71-b09
+d2d1de379f90baea494a747bacfddf6b0591089b jdk8u71-b10
+e71972e92232ad5bb17c79609d75ad3b8062bf10 jdk8u71-b11
 60e623d06ebdcdc681943b16f00a87aeedf46873 jdk8u72-b00
 176a2ce2e2d6fd07964eca60c28c6b0049d7bc4d jdk8u72-b01
 3c5915665396301b730f808f8f5aa6e95b7c6113 jdk8u72-b02
@@ -513,4 +522,9 @@
 5b5626716c88646895c4ada9ed1a35b24e7148c8 jdk8u72-b04
 1636e47c2d48d92827dac1493d292ebe19a2e108 jdk8u72-b05
 3a3863b12884f6167261f995b5eb0b8c69495f30 jdk8u72-b06
+8045ef94fd11dbda897404de345d1ea1eef52a01 jdk8u72-b07
+be05920afa17d374bc853d890a1575db097ac91c jdk8u72-b08
+8404d311c13333d4b2455bb75bf1aa10a7e55bc2 jdk8u72-b09
+619ab54940fc02e32966ceedcbd7726d7b50ee97 jdk8u72-b10
+8cff3169fa7b95c47599c1312e4dae97ea5228f3 jdk8u72-b11
 eca165c0654ac2e1926b50655e5ed5e9b73ca674 jdk8u75-b00
--- a/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java	Thu Oct 29 17:44:24 2015 -0700
+++ b/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_de.java	Wed Dec 02 23:17:53 2015 -0800
@@ -1359,7 +1359,7 @@
   {  "optionE", "   [-E (Entit\u00E4tsreferenzen nicht einblenden)]"},
   {  "optionV",  "   [-E (Entit\u00E4tsreferenzen nicht einblenden)]"},
   {  "optionQC", "   [-QC (Stille Musterkonfliktwarnungen)]"},
-  {  "optionQ", "   [-Q  (Stiller Modus)]"},
+  {  "optionQ", "   [-Q  (Silent-Modus)]"},
   {  "optionLF", "   [-LF (Nur Zeilenvorsch\u00FCbe bei Ausgabe verwenden {Standard ist CR/LF})]"},
   {  "optionCR", "   [-CR (Nur Zeilenschaltungen bei Ausgabe verwenden {Standard ist CR/LF})]"},
   { "optionESCAPE", "   [-ESCAPE (Escapezeichen {Standard ist <>&\"'\r\n}]"},
--- a/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java	Thu Oct 29 17:44:24 2015 -0700
+++ b/src/com/sun/org/apache/xalan/internal/res/XSLTErrorResources_fr.java	Wed Dec 02 23:17:53 2015 -0800
@@ -1210,7 +1210,7 @@
       "Le nom de fonction ne peut pas \u00EAtre NULL."},
 
     { ER_XPATH_RESOLVER_NEGATIVE_ARITY,
-      "Le nombre d'arguments ne peut pas \u00EAtre n\u00E9gatif."},
+      "L'arit\u00E9 ne peut pas \u00EAtre n\u00E9gative."},
   // Warnings...
 
     { WG_FOUND_CURLYBRACE,