Merge branch 'master' into jgrpp

# Conflicts: # src/company_gui.cpp # src/group_gui.cpp # src/newgrf.cpp # src/newgrf_debug_gui.cpp # src/saveload/saveload.cpp
2023-08-19 01:13:00 +01:00
parent ef168b7d46 6eb51666bc
commit 5a28405ced
22 changed files with 109 additions and 171 deletions
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -204,6 +204,7 @@ add_files(
    group_cmd.cpp
    group_gui.cpp
    group_gui.h
+    group_gui_list.h
    group_type.h
    gui.h
    guitimer_func.h