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

2026-03-02 10:48:24 -07:00 · 2022-09-18 22:24:00 -04:00
parent c5b496b6e7 b2fb6dbeec
commit 4add963c1f
363 changed files with 75933 additions and 78136 deletions
--- a/src/machine/machine_table.c
+++ b/src/machine/machine_table.c
@@ -201,6 +201,7 @@ const machine_filter_t machine_chipsets[] = {


 const machine_t machines[] = {
+  // clang-format off
    /* 8088 Machines */
    {
        .name = "[8088] IBM PC (1981)",
@@ -11818,6 +11819,7 @@ const machine_t machines[] = {
        .snd_device = NULL,
        .net_device = NULL
    }
+  // clang-format on
 };

 /* Saved copies - jumpers get applied to these.