Conflict resolution.

2021-10-19 18:18:15 +02:00
parent 03cdf58aca 966ca29e9d
commit a394a33500
24 changed files with 922 additions and 1216 deletions
--- a/src/machine/m_xt.c
+++ b/src/machine/m_xt.c
@@ -405,11 +405,11 @@ machine_xt_pc700_init(const machine_t *model)


 int
-machine_xt_multitechpc500_init(const machine_t* model)
+machine_xt_pc500_init(const machine_t* model)
 {
    int ret;

-    ret = bios_load_linear("roms/machines/multitech_pc500/rom404.bin",
+    ret = bios_load_linear("roms/machines/pc500/rom404.bin",
 			   0x000f8000, 32768, 0);

    if (bios_only || !ret)