Merge branch 'qt' of https://github.com/jgilje/86Box into qt

2021-12-16 19:35:34 +02:00
parent 07e0b54171 92b7ea8536
commit bb4859e55e
2 changed files with 12 additions and 18 deletions
--- a/src/qt/sdl_joystick.cpp
+++ b/src/qt/sdl_joystick.cpp
@@ -2,6 +2,8 @@

 #include <SDL2/SDL.h>

+#include <algorithm>
+
 extern "C" {
 #include <86box/device.h>
 #include <86box/gameport.h>