Merge branch 'master' of ssh://github.com/86Box/86Box into cleanup30

2022-07-12 20:07:19 -03:00
parent af7230496b f70649af7c
commit 537e43a1f9
130 changed files with 2377 additions and 224122 deletions
--- a/src/qt/qt_mediamenu.cpp
+++ b/src/qt/qt_mediamenu.cpp
@@ -33,6 +33,7 @@ extern "C" {
 #include <86box/timer.h>
 #include <86box/plat.h>
 #include <86box/cassette.h>
+#include <86box/machine.h>
 #include <86box/cartridge.h>
 #include <86box/fdd.h>
 #include <86box/fdd_86f.h>