Merge remote-tracking branch 'origin/master' into season3

# Conflicts:
#	src/frontend/qt_sdl/EmuInstance.cpp
This commit is contained in:
Arisotura
2024-08-07 01:34:12 +02:00
56 changed files with 1329 additions and 842 deletions

View File

@ -265,7 +265,7 @@ public:
QAction* actEjectCart;
QAction* actCurrentGBACart;
QAction* actInsertGBACart;
QAction* actInsertGBAAddon[1];
QAction* actInsertGBAAddon[2];
QAction* actEjectGBACart;
QAction* actImportSavefile;
QAction* actSaveState[9];