Merge branch 'master' into jgrpp

# Conflicts: # src/os/windows/library_loader_win.cpp
2024-01-14 12:53:24 +00:00
parent b5debe9b14 93ba6d6776
commit 19a8b7b445
14 changed files with 230 additions and 196 deletions
--- a/src/blitter/32bpp_anim_sse4.cpp
+++ b/src/blitter/32bpp_anim_sse4.cpp
@@ -10,9 +10,9 @@
 #ifdef WITH_SSE

 #include "../stdafx.h"
+#include "../palette_func.h"
 #include "../video/video_driver.hpp"
 #include "../table/sprites.h"
-#include "../palette_func.h"
 #include "32bpp_anim_sse4.hpp"
 #include "32bpp_sse_func.hpp"