summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAndrew <forkk@forkk.net>2013-11-28 14:51:34 -0600
committerAndrew <forkk@forkk.net>2013-11-28 14:51:34 -0600
commit8232271c00efd82885a8790acb5b8e318411fd14 (patch)
treec903b3c437c003876daaa0b012757c301fe98086
parenta914e8bd2465302067dad949747d0557b3fcd0ae (diff)
parent60e325b8af3a931d819a8048f8b8eaf20f33c174 (diff)
downloadMultiMC-8232271c00efd82885a8790acb5b8e318411fd14.tar
MultiMC-8232271c00efd82885a8790acb5b8e318411fd14.tar.gz
MultiMC-8232271c00efd82885a8790acb5b8e318411fd14.tar.lz
MultiMC-8232271c00efd82885a8790acb5b8e318411fd14.tar.xz
MultiMC-8232271c00efd82885a8790acb5b8e318411fd14.zip
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_yggdrasil
-rw-r--r--logic/OneSixRule.cpp1
1 files changed, 1 insertions, 0 deletions
diff --git a/logic/OneSixRule.cpp b/logic/OneSixRule.cpp
index d35be720..392b1dd1 100644
--- 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()