Merge branch 'master' into mueller/ipc-updates

2020-09-26 14:21:05 +02:00
parent 74b9aef36b d1fb512c1f
commit 496251bd68
4 changed files with 4 additions and 2 deletions
@@ -6,8 +6,8 @@
 #include <linux/sysinfo.h>
 #include <time.h>
 #include <unistd.h>
+#include <fstream>

-//#include <fstream>
 uint16_t Clock::leapSeconds = 0;
 MutexIF* Clock::timeMutex = NULL;