1 files changed, 12 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index d04a69f..b7a9f65 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,15 @@
+2012-10-29  Omair Majid  <[email protected]>
+
+	PR1186
+	* netx/net/sourceforge/jnlp/config/DeploymentConfiguration.java:
+	(load(boolean)): Delegate to load(File,File,boolean).
+	(load(File,File,boolean)): New method.
+	(copyTo): New method.
+	* netx/net/sourceforge/jnlp/runtime/JNLPRuntime.java:
+	(initialize): Copy configuration to system properties.
+	* tests/netx/unit/net/sourceforge/jnlp/config/DeploymentConfigurationTest.java:
+	New File.
+
 2012-10-29  Jana Fabrikova <[email protected]>
 
 	* tests/reproducers/simple/JSToJSet