diff options
| author | Andrew <forkk@forkk.net> | 2013-12-01 14:28:47 -0600 |
|---|---|---|
| committer | Andrew <forkk@forkk.net> | 2013-12-01 14:28:47 -0600 |
| commit | 613699b3626aea750093ab7eaaeccaa28c0e87c6 (patch) | |
| tree | 7fd542b8f4be10359ba2aaeac9834f1b5c86a750 /gui/dialogs/InstanceSettings.cpp | |
| parent | 2427ad687137bbcfc7303a931d7e0b74d5325e48 (diff) | |
| parent | 75c4d97b90e39f2bda6e682def0fdda044cbcf6f (diff) | |
| download | MultiMC-613699b3626aea750093ab7eaaeccaa28c0e87c6.tar MultiMC-613699b3626aea750093ab7eaaeccaa28c0e87c6.tar.gz MultiMC-613699b3626aea750093ab7eaaeccaa28c0e87c6.tar.lz MultiMC-613699b3626aea750093ab7eaaeccaa28c0e87c6.tar.xz MultiMC-613699b3626aea750093ab7eaaeccaa28c0e87c6.zip | |
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
Diffstat (limited to 'gui/dialogs/InstanceSettings.cpp')
| -rw-r--r-- | gui/dialogs/InstanceSettings.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/gui/dialogs/InstanceSettings.cpp b/gui/dialogs/InstanceSettings.cpp index f059047f..bc6b266a 100644 --- a/gui/dialogs/InstanceSettings.cpp +++ b/gui/dialogs/InstanceSettings.cpp @@ -32,7 +32,7 @@ #include <QMessageBox> InstanceSettings::InstanceSettings(SettingsObject *obj, QWidget *parent) - : m_obj(obj), QDialog(parent), ui(new Ui::InstanceSettings) + : QDialog(parent), ui(new Ui::InstanceSettings), m_obj(obj) { MultiMCPlatform::fixWM_CLASS(this); ui->setupUi(this); |