Merge branch 'release-0.1'

Release MultiMC version 0.1.

1 files changed, 5 insertions, 0 deletions

diff --git a/MultiMC.h b/MultiMC.h
index d02099f3..18c7aab7 100644
--- a/MultiMC.h
+++ b/MultiMC.h
@@ -124,6 +124,11 @@ public:
 	void installUpdates(const QString updateFilesDir, UpdateFlags flags = None);
 
 	/*!
+	 * Updates the application proxy settings from the settings object.
+	 */
+	void updateProxySettings();
+
+	/*!
 	 * Opens a json file using either a system default editor, or, if note empty, the editor
 	 * specified in the settings
 	 */