Merge branch 'master' into jgrpp

# Conflicts: # src/network/core/os_abstraction.h # src/network/core/tcp_content.h # src/network/core/udp.cpp # src/table/currency_settings.ini # src/table/settings.h.preamble
2021-05-03 21:59:49 +01:00
parent e0d5bf584d 8fa53f543a
commit a9515456cb
28 changed files with 377 additions and 185 deletions
--- a/src/saveload/newgrf_sl.cpp
+++ b/src/saveload/newgrf_sl.cpp
@@ -9,6 +9,7 @@

 #include "../stdafx.h"
 #include "../fios.h"
+#include "../string_func.h"

 #include "saveload.h"
 #include "newgrf_sl.h"