Previous | 199869 Revisions | Next |
r176775 Monday 2nd August, 2021 at 13:43:51 UTC by Angelo Salese |
---|
Fix merge conflicts |
[/branches/pc98_state/scripts/src] | machine.lua |
[/branches/pc98_state/scripts/target/mame] | arcade.lua mess.lua |
[/branches/pc98_state/src/devices/bus/cbus] | pc9801_cbus.cpp |
[/branches/pc98_state/src/devices/machine] | upd4991a.cpp* upd4991a.h* |
[/branches/pc98_state/src/mame] | mame.lst |
[/branches/pc98_state/src/mame/drivers] | neogeo.cpp pc9801.cpp pc98ha.cpp* |
[/branches/pc98_state/src/mame/includes] | pc9801.h |
https://github.com/mamedev/mame/commit/8e4d29124c354c289ac09266c8313e5b5a41ac33 |
Previous | 199869 Revisions | Next |