Merge branch 'master' into master

2020-04-16 14:43:10 +02:00
parent f34163a065 967001d9d3
commit 2d02ae5e97
43 changed files with 142 additions and 35 deletions
--- a/include/modules/memory.hpp
+++ b/include/modules/memory.hpp
@ -2,6 +2,7 @@

 #include <fmt/format.h>
 #include <fstream>
+#include <unordered_map>
 #include "ALabel.hpp"
 #include "util/sleeper_thread.hpp"