diff options
| author | Jan Dalheimer <jan@dalheimer.de> | 2013-12-16 21:17:50 +0100 |
|---|---|---|
| committer | Jan Dalheimer <jan@dalheimer.de> | 2013-12-16 21:17:50 +0100 |
| commit | 47bf7fff27665496bc4212bcaccc80350f665f97 (patch) | |
| tree | 878fd220464c5280fcbe589d3ed738ce0306ab2a /logic/BaseInstance.h | |
| parent | ae68adc3a536525990b0668703fd74eded8ccfde (diff) | |
| parent | dff00a6d2abb84a93e48ff00dda16444550d859f (diff) | |
| download | MultiMC-47bf7fff27665496bc4212bcaccc80350f665f97.tar MultiMC-47bf7fff27665496bc4212bcaccc80350f665f97.tar.gz MultiMC-47bf7fff27665496bc4212bcaccc80350f665f97.tar.lz MultiMC-47bf7fff27665496bc4212bcaccc80350f665f97.tar.xz MultiMC-47bf7fff27665496bc4212bcaccc80350f665f97.zip | |
Merge remote-tracking branch 'upstream/develop' into updater_tests
Conflicts:
mmc_updater/src/tests/CMakeLists.txt
Diffstat (limited to 'logic/BaseInstance.h')
| -rw-r--r-- | logic/BaseInstance.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/logic/BaseInstance.h b/logic/BaseInstance.h index 93e57414..5f426676 100644 --- a/logic/BaseInstance.h +++ b/logic/BaseInstance.h @@ -149,7 +149,7 @@ public: */ virtual SettingsObject &settings() const; - /// returns a valid update task if update is needed, NULL otherwise + /// returns a valid update task virtual std::shared_ptr<Task> doUpdate(bool only_prepare) = 0; /// returns a valid minecraft process, ready for launch with the given account. |