diff options
| author | Jean-François Milants <jf@codingfield.com> | 2022-09-11 14:59:49 +0200 |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2022-09-11 14:59:49 +0200 |
| commit | ada2c09581d2d13acfa5ce9a97671c0ec17863f1 (patch) | |
| tree | 2f776adc59d0c63e403d2043cb8460e65d6c46fe /src/BootloaderVersion.h | |
| parent | 18cff286c75f432095db4b188e0f9a8a9e2bd8e8 (diff) | |
| parent | c9a5c3fa5c930a5939d3114a6c6b48570d61ca24 (diff) | |
Merge branch 'develop' into infineat-external-resources
# Conflicts:
# src/displayapp/screens/Symbols.h
# src/displayapp/screens/settings/SettingWatchFace.cpp
# src/displayapp/screens/settings/SettingWatchFace.h
Diffstat (limited to 'src/BootloaderVersion.h')
| -rw-r--r-- | src/BootloaderVersion.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/BootloaderVersion.h b/src/BootloaderVersion.h index 7ed90fa9..85d5e0ec 100644 --- a/src/BootloaderVersion.h +++ b/src/BootloaderVersion.h @@ -6,11 +6,11 @@ namespace Pinetime { class BootloaderVersion { public: - static const uint32_t Major(); - static const uint32_t Minor(); - static const uint32_t Patch(); + static uint32_t Major(); + static uint32_t Minor(); + static uint32_t Patch(); static const char* VersionString(); - static const bool IsValid(); + static bool IsValid(); static void SetVersion(uint32_t v); private: |