diff options
| author | Jan Dalheimer <jan@dalheimer.de> | 2014-02-01 19:58:13 +0100 |
|---|---|---|
| committer | Jan Dalheimer <jan@dalheimer.de> | 2014-02-01 19:58:13 +0100 |
| commit | 983a40698c47739fee3786cf54c917004523ea36 (patch) | |
| tree | 4a0d73577afbf430934cd878ff23674aaa7aea74 /logic/OneSixFTBInstance.h | |
| parent | 866d7029afa10293a57d71aecbe3629399c95d06 (diff) | |
| parent | 1936bd181f57a554ce0dd757ffe9419100eb47f4 (diff) | |
| download | PrismLauncher-983a40698c47739fee3786cf54c917004523ea36.tar.gz PrismLauncher-983a40698c47739fee3786cf54c917004523ea36.tar.bz2 PrismLauncher-983a40698c47739fee3786cf54c917004523ea36.zip | |
Merge remote-tracking branch 'upstream/feature_derpstances' into feature_derpstances
Diffstat (limited to 'logic/OneSixFTBInstance.h')
| -rw-r--r-- | logic/OneSixFTBInstance.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/logic/OneSixFTBInstance.h b/logic/OneSixFTBInstance.h index dc028819..bc543aeb 100644 --- a/logic/OneSixFTBInstance.h +++ b/logic/OneSixFTBInstance.h @@ -13,7 +13,7 @@ public: virtual QString getStatusbarDescription(); virtual bool menuActionEnabled(QString action_name) const; - virtual std::shared_ptr<Task> doUpdate(bool only_prepare) override; + virtual std::shared_ptr<Task> doUpdate() override; virtual QString id() const; |