diff options
| author | Jean-François Milants <jf@codingfield.com> | 2021-07-13 20:53:40 +0200 |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2021-07-13 20:53:40 +0200 |
| commit | e2efb193c4af3b6f447e82be0d29ceccd734c507 (patch) | |
| tree | 120e45f628654821db0fc141e550bb0feac34e3d /src/displayapp/screens/BatteryIcon.cpp | |
| parent | af10747c94080123a5847d5258c2cfeb7ec317cb (diff) | |
| parent | 99e26bdd4cbafcdeec815ce6435f1830f1d74816 (diff) | |
Merge branch 'lvgl_use_system_tick' of https://github.com/Riksu9000/InfiniTime into Riksu9000-lvgl_use_system_tick
# Conflicts:
# src/displayapp/screens/BatteryInfo.cpp
# src/displayapp/screens/BatteryInfo.h
Diffstat (limited to 'src/displayapp/screens/BatteryIcon.cpp')
0 files changed, 0 insertions, 0 deletions