diff options
| author | Andrew <forkk@forkk.net> | 2013-12-15 15:01:34 -0600 |
|---|---|---|
| committer | Andrew <forkk@forkk.net> | 2013-12-15 15:01:34 -0600 |
| commit | 9d8006b597aead06f1d51dacbdb346ebab3d5e8f (patch) | |
| tree | 1f99ca1da321be32930198e3d72b2fc9d3bf53de /logic/BaseInstance.h | |
| parent | 0ee8f90d40f5b3ddb177286c9066a4e59748c681 (diff) | |
| parent | b0e8037feb5b9d48defe6b8263d068f87bdb141c (diff) | |
| download | MultiMC-9d8006b597aead06f1d51dacbdb346ebab3d5e8f.tar MultiMC-9d8006b597aead06f1d51dacbdb346ebab3d5e8f.tar.gz MultiMC-9d8006b597aead06f1d51dacbdb346ebab3d5e8f.tar.lz MultiMC-9d8006b597aead06f1d51dacbdb346ebab3d5e8f.tar.xz MultiMC-9d8006b597aead06f1d51dacbdb346ebab3d5e8f.zip | |
Merge branch 'develop' of github.com:MultiMC/MultiMC5 into feature_news
Conflicts:
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. |