Merge remote-tracking branch 'upstream/master' into feature/ich2

This commit is contained in:
Jasmine Iwanek
2022-11-05 21:24:26 -04:00
10 changed files with 592 additions and 38 deletions

View File

@@ -4426,7 +4426,7 @@ const machine_t machines[] = {
.max_multi = 0
},
.bus_flags = MACHINE_AT,
.flags = MACHINE_IDE,
.flags = 0,
.ram = {
.min = 1024,
.max = 32768,