summaryrefslogtreecommitdiff
path: root/.gitmodules
AgeCommit message (Collapse)Author
2021-03-07Merge branch 'develop' into recovery-firmwareJean-François Milants
# Conflicts: # src/CMakeLists.txt # src/displayapp/DisplayApp.h # src/systemtask/SystemTask.cpp # src/systemtask/SystemTask.h
2021-01-28LVGL V7 UpgradeJoaquim