diff options
| author | Jean-François Milants <jf@codingfield.com> | 2022-02-20 15:40:49 +0100 |
|---|---|---|
| committer | Jean-François Milants <jf@codingfield.com> | 2022-02-20 15:40:49 +0100 |
| commit | ef44b763d94cc6ff1be6f75ff3e638d7d356e99e (patch) | |
| tree | a10a4068c592f13057edf3d1f2a94137becd95b8 /doc/SWD.md | |
| parent | 40cdb547727d99ff140a029ae30980001e4a68f6 (diff) | |
Merge branch 'airplane-mode' of https://github.com/evergreen22/InfiniTime into evergreen22-airplane-mode
Apply a few changes that were requested in the PR during the review.
# Conflicts:
# src/CMakeLists.txt
# src/displayapp/Apps.h
# src/displayapp/DisplayApp.cpp
# src/displayapp/Messages.h
# src/displayapp/screens/settings/Settings.cpp
Diffstat (limited to 'doc/SWD.md')
0 files changed, 0 insertions, 0 deletions