diff options
| author | Petr Mrázek <peterix@gmail.com> | 2014-02-01 19:37:16 +0100 |
|---|---|---|
| committer | Petr Mrázek <peterix@gmail.com> | 2014-02-01 19:37:16 +0100 |
| commit | 1936bd181f57a554ce0dd757ffe9419100eb47f4 (patch) | |
| tree | a22660979335746b930c88f353b4e29f1bbe9a2a /logic/OneSixRule.h | |
| parent | b4b6091372310f4a811180cffde3ea5611881e6c (diff) | |
| parent | 8637cce4333aaf56a231d5fab866b0e770436783 (diff) | |
| download | PrismLauncher-1936bd181f57a554ce0dd757ffe9419100eb47f4.tar.gz PrismLauncher-1936bd181f57a554ce0dd757ffe9419100eb47f4.tar.bz2 PrismLauncher-1936bd181f57a554ce0dd757ffe9419100eb47f4.zip | |
Merge branch 'feature_derpstances' of https://github.com/02JanDal/MultiMC5 into feature_derpstances
Conflicts:
gui/dialogs/OneSixModEditDialog.cpp
logic/OneSixUpdate.cpp
Diffstat (limited to 'logic/OneSixRule.h')
| -rw-r--r-- | logic/OneSixRule.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/logic/OneSixRule.h b/logic/OneSixRule.h index 5a13cbd9..426e2886 100644 --- a/logic/OneSixRule.h +++ b/logic/OneSixRule.h @@ -27,7 +27,7 @@ enum RuleAction }; RuleAction RuleAction_fromString(QString); -QList<std::shared_ptr<Rule>> rulesFromJsonV4(QJsonObject &objectWithRules); +QList<std::shared_ptr<Rule>> rulesFromJsonV4(const QJsonObject &objectWithRules); class Rule { |