diff options
| author | Petr Mrázek <peterix@gmail.com> | 2013-11-28 21:28:57 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2013-11-28 21:28:57 +0100 |
| commit | 60e325b8af3a931d819a8048f8b8eaf20f33c174 (patch) | |
| tree | c903b3c437c003876daaa0b012757c301fe98086 /logic | |
| parent | 61f1dd6e2ba2d863cf24a0bb4f189fa180a0ee52 (diff) | |
| parent | c0c7037e18a7b4539f219c5fd8de30021d66c6d4 (diff) | |
| download | MultiMC-60e325b8af3a931d819a8048f8b8eaf20f33c174.tar MultiMC-60e325b8af3a931d819a8048f8b8eaf20f33c174.tar.gz MultiMC-60e325b8af3a931d819a8048f8b8eaf20f33c174.tar.lz MultiMC-60e325b8af3a931d819a8048f8b8eaf20f33c174.tar.xz MultiMC-60e325b8af3a931d819a8048f8b8eaf20f33c174.zip | |
Merge https://github.com/brainiac744/MultiMC5 into develop
Diffstat (limited to 'logic')
| -rw-r--r-- | logic/OneSixRule.cpp | 1 |
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() |