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
parent 740b3d7b58 ada9425357
commit 9f67e6f652
559 changed files with 33795 additions and 100474 deletions
--- a/doc/buildAndProgram.md
+++ b/doc/buildAndProgram.md
@@ -10,6 +10,7 @@ To build this project, you'll need:
 ```
 git clone https://github.com/JF002/Pinetime.git
 cd Pinetime
+git submodule update --init
 mkdir build
 cd build
 ```