piwalker/melonDS
1
0
Fork 0
mirror of https://github.com/melonDS-emu/melonDS.git synced 2025-07-23 22:29:47 -06:00
Code Issues Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	src/frontend/qt_sdl/EmuInstance.cpp
This commit is contained in:
Arisotura
2024-08-07 01:34:12 +02:00
parent d57fbd3f17 dd386d12a9
commit 9dbb4babfa
56 changed files with 1329 additions and 842 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontend/qt_sdl/Window.h
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];