post rebase fixes
This commit is contained in:
parent
319dfd23e7
commit
917e46c684
9 changed files with 113 additions and 85 deletions
|
|
@ -98,10 +98,6 @@ namespace Pinetime {
|
|||
appMenu = menu;
|
||||
};
|
||||
|
||||
uint8_t GetAppMenu() const {
|
||||
return appMenu;
|
||||
};
|
||||
|
||||
void SetWatchfacesMenu(uint8_t menu) {
|
||||
watchFacesMenu = menu;
|
||||
};
|
||||
|
|
@ -110,6 +106,11 @@ namespace Pinetime {
|
|||
return watchFacesMenu;
|
||||
};
|
||||
|
||||
|
||||
uint8_t GetAppMenu() const {
|
||||
return appMenu;
|
||||
};
|
||||
|
||||
void SetSettingsMenu(uint8_t menu) {
|
||||
settingsMenu = menu;
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue