changeset 507:86d0250b62bb jdk7u11-b06

Merge
author ewendeli
date Tue, 27 Nov 2012 21:45:31 +0100
parents 162a2c6ad871 814336b508cb
children e59b97ddc3ff
files .hgtags
diffstat 2 files changed, 4 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Wed Nov 21 21:08:54 2012 -0800
+++ b/.hgtags	Tue Nov 27 21:45:31 2012 +0100
@@ -220,3 +220,6 @@
 89b043ba2e01e969090e23a5a7a2e9f7165ff5a0 jdk7u10-b15
 5449d5396bd8deee90f18f29899343129e3cdc4e jdk7u10-b16
 86c75e6aa3a7fa9a587fc7dd2d08af8aa8ffb9a9 jdk7u10-b17
+5df9207c4378b7f4b24d70b365714c5ee6318982 jdk7u11-b03
+6ee19b9c8313db32e6d8989aa3782830d2b09710 jdk7u11-b04
+3312b258392eaeab9c4a20e3deb36d3ae3337efe jdk7u11-b05
--- a/src/com/sun/org/apache/xpath/internal/functions/FuncSystemProperty.java	Wed Nov 21 21:08:54 2012 -0800
+++ b/src/com/sun/org/apache/xpath/internal/functions/FuncSystemProperty.java	Tue Nov 27 21:45:31 2012 +0100
@@ -165,7 +165,7 @@
    * should already be fully qualified as path/filename
    * @param target The target property bag the file will be placed into.
    */
-  public void loadPropertyFile(String file, Properties target)
+  private void loadPropertyFile(String file, Properties target)
   {
     try
     {