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 /logic/BaseInstance.cpp | |
| parent | 2427ad687137bbcfc7303a931d7e0b74d5325e48 (diff) | |
| parent | 75c4d97b90e39f2bda6e682def0fdda044cbcf6f (diff) | |
| download | PrismLauncher-613699b3626aea750093ab7eaaeccaa28c0e87c6.tar.gz PrismLauncher-613699b3626aea750093ab7eaaeccaa28c0e87c6.tar.bz2 PrismLauncher-613699b3626aea750093ab7eaaeccaa28c0e87c6.zip | |
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into develop
Diffstat (limited to 'logic/BaseInstance.cpp')
| -rw-r--r-- | logic/BaseInstance.cpp | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/logic/BaseInstance.cpp b/logic/BaseInstance.cpp index c38f75ef..6f8222b7 100644 --- a/logic/BaseInstance.cpp +++ b/logic/BaseInstance.cpp @@ -30,7 +30,7 @@ BaseInstance::BaseInstance(BaseInstancePrivate *d_in, const QString &rootDir, SettingsObject *settings_obj, QObject *parent) - : inst_d(d_in), QObject(parent) + : QObject(parent), inst_d(d_in) { I_D(BaseInstance); d->m_settings = settings_obj; |