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

Conflicts: CMakeLists.txt
2013-12-15 15:01:34 -06:00
parent 0ee8f90d40 b0e8037feb
commit 9d8006b597
45 changed files with 796 additions and 541 deletions
--- a/MultiMC.h
+++ b/MultiMC.h
@@ -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()