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
..
gamepad.h	naomi2: initd card support. lua: fix multi-threading crash	2022-02-16 19:02:04 +01:00
gamepad_device.cpp	Merge remote-tracking branch 'origin/master' into dev	2023-01-27 15:41:45 +01:00
gamepad_device.h	new naomi network protocol. vblank event. initd rumble support	2022-03-27 15:23:21 +02:00
keyboard_device.h	cleanup include headers	2023-01-26 10:06:51 +01:00
mapping.cpp	new naomi network protocol. vblank event. initd rumble support	2022-03-27 15:23:21 +02:00
mapping.h	new naomi network protocol. vblank event. initd rumble support	2022-03-27 15:23:21 +02:00
mouse.cpp	cleanup include headers	2023-01-26 10:06:51 +01:00
mouse.h	input: fix naomi rotary encoders	2022-03-06 17:57:16 +01:00