diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-02-06 07:09:32 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-02-06 07:09:32 +0100 |
| commit | 18b087e99280d2c8d5a6115a178f9e6f03606656 (patch) | |
| tree | fbf58928dabbae4540de3d7725f9ac70274fa586 /data/stdinstance.cpp | |
| parent | 4e9006769e3554524096d45f8a1ce16ccfa78bfc (diff) | |
| parent | e475f5d51251ae57da0480bbadc9cb32a8bc72b2 (diff) | |
| download | MultiMC-18b087e99280d2c8d5a6115a178f9e6f03606656.tar MultiMC-18b087e99280d2c8d5a6115a178f9e6f03606656.tar.gz MultiMC-18b087e99280d2c8d5a6115a178f9e6f03606656.tar.lz MultiMC-18b087e99280d2c8d5a6115a178f9e6f03606656.tar.xz MultiMC-18b087e99280d2c8d5a6115a178f9e6f03606656.zip | |
Merge https://github.com/Forkk/MultiMC5
Conflicts:
gui/mainwindow.ui
Diffstat (limited to 'data/stdinstance.cpp')
| -rw-r--r-- | data/stdinstance.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/data/stdinstance.cpp b/data/stdinstance.cpp index 1324b510..4618f5ca 100644 --- a/data/stdinstance.cpp +++ b/data/stdinstance.cpp @@ -15,8 +15,8 @@ #include "stdinstance.h" -StdInstance::StdInstance(QString rootDir) : - InstanceBase(rootDir) +StdInstance::StdInstance(QString rootDir, QObject* parent) : + InstanceBase(rootDir, parent) { } |