changeset 511:48491f5a5817 jdk7u11-b08

Merge
author ewendeli
date Thu, 06 Dec 2012 17:44:28 +0100
parents 853059839d38 eead50d0a471
children 40ec43a18d1d
files .hgtags
diffstat 2 files changed, 6 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/.hgtags	Tue Dec 04 17:28:30 2012 -0800
+++ b/.hgtags	Thu Dec 06 17:44:28 2012 +0100
@@ -222,3 +222,8 @@
 86c75e6aa3a7fa9a587fc7dd2d08af8aa8ffb9a9 jdk7u10-b17
 162a2c6ad8718a63253fa53724f704a4f85731bc jdk7u10-b18
 c59eb287de720ae5ce8087f179ec01f4f6525a32 jdk7u10-b30
+5df9207c4378b7f4b24d70b365714c5ee6318982 jdk7u11-b03
+6ee19b9c8313db32e6d8989aa3782830d2b09710 jdk7u11-b04
+3312b258392eaeab9c4a20e3deb36d3ae3337efe jdk7u11-b05
+86d0250b62bbb4aabab2a7c249aeb14847be2631 jdk7u11-b06
+225aa78c36e9b776c87e585329bbb7ee0e3259a3 jdk7u11-b07
--- a/src/com/sun/org/apache/xpath/internal/functions/FuncSystemProperty.java	Tue Dec 04 17:28:30 2012 -0800
+++ b/src/com/sun/org/apache/xpath/internal/functions/FuncSystemProperty.java	Thu Dec 06 17:44:28 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
     {