aboutsummaryrefslogtreecommitdiff
path: root/gui/dialogs/SettingsDialog.h
diff options
context:
space:
mode:
authorForkk <forkk@forkk.net>2014-01-08 21:45:13 -0600
committerForkk <forkk@forkk.net>2014-01-08 21:45:13 -0600
commit06b5fa5dccdfc54496cd79e6eba6d025bc6e1204 (patch)
tree83d2f49d9e694bdd8f8d2cdd3879e696f435ba10 /gui/dialogs/SettingsDialog.h
parent51817962aa64bc5c084e33fb29a21261d19bc8f3 (diff)
parentb767d4b134148ddb3f956253a2f7f2cad831e782 (diff)
downloadPrismLauncher-06b5fa5dccdfc54496cd79e6eba6d025bc6e1204.tar.gz
PrismLauncher-06b5fa5dccdfc54496cd79e6eba6d025bc6e1204.tar.bz2
PrismLauncher-06b5fa5dccdfc54496cd79e6eba6d025bc6e1204.zip
Merge branch 'release-0.1'
Release MultiMC version 0.1.
Diffstat (limited to 'gui/dialogs/SettingsDialog.h')
-rw-r--r--gui/dialogs/SettingsDialog.h1
1 files changed, 1 insertions, 0 deletions
diff --git a/gui/dialogs/SettingsDialog.h b/gui/dialogs/SettingsDialog.h
index df67d492..d7bbbeb3 100644
--- a/gui/dialogs/SettingsDialog.h
+++ b/gui/dialogs/SettingsDialog.h
@@ -86,6 +86,7 @@ slots:
void refreshUpdateChannelDesc();
void updateChannelSelectionChanged(int index);
+ void proxyChanged(int);
private:
Ui::SettingsDialog *ui;