Merge branch 'master' into jgrpp

# Conflicts: # src/os/windows/crashlog_win.cpp # src/os/windows/font_win32.cpp # src/os/windows/win32.cpp # src/os/windows/win32.h # src/video/win32_v.cpp # src/video/win32_v.h
2024-01-12 18:57:14 +00:00
parent 0436dd1abe 03df70ce8a
commit 8ae1587987
27 changed files with 378 additions and 112 deletions
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -242,6 +242,7 @@ add_files(
    league_gui.h
    league_gui.cpp
    league_type.h
+    library_loader.h
    livery.h
    load_check.h
    main_gui.cpp