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
..
aica	Merge remote-tracking branch 'origin/master' into dev	2023-01-27 15:41:45 +01:00
arm7	Merge remote-tracking branch 'origin/master' into dev	2023-01-27 15:41:45 +01:00
bba	cleanup include headers	2023-01-26 10:06:51 +01:00
flashrom	move rom/flash stuff to hw/flashrom. nvmem api	2023-01-24 19:17:48 +01:00
gdrom	cleanup include headers	2023-01-26 10:06:51 +01:00
holly	cleanup include headers	2023-01-26 10:06:51 +01:00
maple	Merge remote-tracking branch 'origin/master' into dev	2023-01-27 15:41:45 +01:00
mem	Merge remote-tracking branch 'origin/master' into dev	2023-01-27 15:41:45 +01:00
modem	cleanup include headers	2023-01-26 10:06:51 +01:00
naomi	Merge remote-tracking branch 'origin/master' into dev	2023-01-27 15:41:45 +01:00
pvr	Merge remote-tracking branch 'origin/master' into dev	2023-01-27 15:41:45 +01:00
sh4	Merge remote-tracking branch 'origin/master' into dev	2023-01-27 15:41:45 +01:00
hwreg.h	holly, sh4: reg access handlers don't need size. SB_FFST constant 0	2022-12-06 20:42:00 +01:00