External/UltimMC_Launcher
1
0
Fork 0
mirror of https://github.com/UltimMC/Launcher.git synced 2026-01-05 22:59:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'testing' of https://github.com/02JanDal/MultiMC5 into develop

Browse Source 
Conflicts:
	MultiMC.cpp
This commit is contained in:
Petr Mrázek
2013-12-14 14:00:23 +01:00
parent 4623aa44f5 1167a66ac8
commit 8f856f5573
16 changed files with 368 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MultiMC.h
View File

@@ -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()