diff options
| author | Jean-François Milants <jf@codingfield.com> | 2022-01-04 21:48:08 +0100 |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2022-01-04 21:48:08 +0100 |
| commit | bef3e708f6b5a6f71797f72aab89d09520813046 (patch) | |
| tree | 8e955bb1b6c11c65afcc30eb39174ab20bfa0437 /bootloader/flash_bootloader_app.sh | |
| parent | b8b54f47a2a09e32186bf7d8dddc658fae2c6e5f (diff) | |
| parent | e82469bffac6383ab898fa71dc3a88e164dc86ff (diff) | |
Merge branch 'ShakeWake' of https://github.com/geekbozu/InfiniTime into geekbozu-ShakeWake
# Conflicts:
# src/CMakeLists.txt
# src/displayapp/Apps.h
# src/displayapp/DisplayApp.cpp
# src/displayapp/screens/settings/Settings.cpp
Diffstat (limited to 'bootloader/flash_bootloader_app.sh')
0 files changed, 0 insertions, 0 deletions