External/UltimMC_Launcher
1
0
Fork 0
mirror of https://github.com/UltimMC/Launcher.git synced 2025-12-14 12:37:23 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_news

Browse Source 
Conflicts:
	CMakeLists.txt
This commit is contained in:
Andrew
2013-12-15 15:01:34 -06:00
parent 0ee8f90d40 b0e8037feb
commit 9d8006b597
45 changed files with 796 additions and 541 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
MultiMC.h
View File

@@ -46,7 +46,7 @@ public:
};
public:
MultiMC(int &argc, char **argv);
MultiMC(int &argc, char **argv, const QString &root = QString());
virtual ~MultiMC();
std::shared_ptr<SettingsObject> settings()