Flyinghead 99d5266aa0 Merge remote-tracking branch 'origin/master' into dev ... # Conflicts: # core/hw/holly/sb_mem.cpp # core/hw/naomi/naomi.cpp # core/hw/naomi/naomi_flashrom.cpp # core/hw/pvr/ta_ctx.h # core/rend/gui.cpp		2023-01-27 15:41:45 +01:00
..
maple_cfg.cpp	maple: don't recreate devs on rollback. Raise error if dest is invalid	2022-12-17 10:51:12 +01:00
maple_cfg.h	New serialize framework. Delay maple dma xfer	2021-11-13 15:56:42 +01:00
maple_devs.cpp	Merge remote-tracking branch 'origin/master' into dev	2023-01-27 15:41:45 +01:00
maple_devs.h	cheats: don't rely on cheat count on load. Fix compile warnings	2021-12-11 18:33:28 +01:00
maple_helper.cpp	maple: msb selection, implement/fake reset, kill and allreq commands	2020-06-15 17:04:04 +02:00
maple_helper.h	naomi: auto configure eeprom and bbsram for network	2020-04-19 21:45:15 +02:00
maple_if.cpp	cleanup include headers	2023-01-26 10:06:51 +01:00
maple_if.h	aw: analog and lightgun inputs not responsive after load state	2021-01-22 15:11:04 +01:00
maple_jvs.cpp	Merge remote-tracking branch 'origin/master' into dev	2023-01-27 15:41:45 +01:00