Merge 'upstream/master' - At least it builds...

2026-08-20 14:39:01 +00:00 · 2017-01-16 03:45:44 +00:00
parent f39954856e 052fd1c407
commit 5e40669cbc
298 changed files with 8122 additions and 4685 deletions
@@ -29,7 +29,7 @@
 #include "baseband_api.hpp"
 #include "ui_navigation.hpp"
 #include "ui_receiver.hpp"
-#include "time.hpp"
+#include "rtc_time.hpp"
 #include "message.hpp"
 #include "volume.hpp"
 #include "audio.hpp"