diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-12-14 14:00:23 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-12-14 14:00:23 +0100 |
| commit | 8f856f55732e6427e9b4994343b01f9ac0e0daee (patch) | |
| tree | 09ca49c42d53ed4510d0aa7231bdb2cdad0be459 /MultiMC.h | |
| parent | 4623aa44f58575b6d2ceb0b047945ffeb0081f65 (diff) | |
| parent | 1167a66ac89d1510fbb522544e9733cc086f35eb (diff) | |
| download | MultiMC-8f856f55732e6427e9b4994343b01f9ac0e0daee.tar MultiMC-8f856f55732e6427e9b4994343b01f9ac0e0daee.tar.gz MultiMC-8f856f55732e6427e9b4994343b01f9ac0e0daee.tar.lz MultiMC-8f856f55732e6427e9b4994343b01f9ac0e0daee.tar.xz MultiMC-8f856f55732e6427e9b4994343b01f9ac0e0daee.zip | |
Merge branch 'testing' of https://github.com/02JanDal/MultiMC5 into develop
Conflicts:
MultiMC.cpp
Diffstat (limited to 'MultiMC.h')
| -rw-r--r-- | MultiMC.h | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -45,7 +45,7 @@ public: }; public: - MultiMC(int &argc, char **argv); + MultiMC(int &argc, char **argv, const QString &root = QString()); virtual ~MultiMC(); std::shared_ptr<SettingsObject> settings() |