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

This commit is contained in:
Andrew 2013-11-28 14:51:34 -06:00
commit 8232271c00

View File

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