Sneederix/sneedmc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Andrew 2013-11-28 14:51:34 -06:00
commit 8232271c00
1 changed files with 1 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
logic/OneSixRule.cpp
View File

@ -56,6 +56,7 @@ QList<std::shared_ptr<Rule>> rulesFromJsonV4(QJsonObject &objectWithRules)
// add a new OS rule // add a new OS rule
rules.append(OsRule::create(action, requiredOs, versionRegex)); rules.append(OsRule::create(action, requiredOs, versionRegex));
} }
return rules;
} }
QJsonObject ImplicitRule::toJson() QJsonObject ImplicitRule::toJson()