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

Conflicts: MultiMC.cpp
2013-12-14 14:00:23 +01:00
parent 4623aa44f5 1167a66ac8
commit 8f856f5573
16 changed files with 368 additions and 41 deletions
--- a/MultiMC.h
+++ b/MultiMC.h
@@ -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()