Merge https://github.com/brainiac744/MultiMC5 into develop

2013-11-28 21:28:57 +01:00 · 2013-11-28 21:28:57 +01:00 · 60e325b8af
commit 60e325b8af
parent 61f1dd6e2b c0c7037e18
1 changed files with 1 additions and 0 deletions
--- a/logic/OneSixRule.cpp
+++ b/logic/OneSixRule.cpp
@ -56,6 +56,7 @@ QList<std::shared_ptr<Rule>> rulesFromJsonV4(QJsonObject &objectWithRules)
 		// add a new OS rule
 		rules.append(OsRule::create(action, requiredOs, versionRegex));
 	}
+    return rules;
 }

 QJsonObject ImplicitRule::toJson()