Jean-François Milants 15b3b8e282 Merge branch 'develop' into motion-sensor ... # Conflicts: # src/CMakeLists.txt # src/displayapp/Apps.h # src/displayapp/DisplayApp.cpp # src/displayapp/DisplayApp.h # src/displayapp/lv_pinetime_theme.c # src/displayapp/screens/ApplicationList.cpp # src/drivers/TwiMaster.cpp # src/systemtask/SystemTask.h		2021-04-09 21:16:21 +02:00
..
SystemMonitor.h	Replaced NULL with nullptr	2020-10-04 15:09:17 +03:00
SystemTask.cpp	Merge branch 'develop' into motion-sensor	2021-04-09 21:16:21 +02:00
SystemTask.h	Merge branch 'develop' into motion-sensor	2021-04-09 21:16:21 +02:00