Commit Graph

2 Commits

Author SHA1 Message Date
Jean-François Milants
9f67e6f652 Merge branch 'develop' into recovery-firmware
# Conflicts:
#	src/CMakeLists.txt
#	src/displayapp/DisplayApp.h
#	src/systemtask/SystemTask.cpp
#	src/systemtask/SystemTask.h
2021-03-07 08:44:14 +01:00
Joaquim
efa99da44d LVGL V7 Upgrade 2021-01-28 17:07:28 +00:00