mirror of
https://github.com/melonDS-emu/melonDS.git
synced 2025-07-23 22:29:47 -06:00
Merge remote-tracking branch 'origin/master' into season3
# Conflicts: # src/frontend/qt_sdl/EmuInstance.cpp
This commit is contained in:
@ -265,7 +265,7 @@ public:
|
||||
QAction* actEjectCart;
|
||||
QAction* actCurrentGBACart;
|
||||
QAction* actInsertGBACart;
|
||||
QAction* actInsertGBAAddon[1];
|
||||
QAction* actInsertGBAAddon[2];
|
||||
QAction* actEjectGBACart;
|
||||
QAction* actImportSavefile;
|
||||
QAction* actSaveState[9];
|
||||
|
Reference in New Issue
Block a user