Merge branch 'master' of https://github.com/86Box/86Box

# Conflicts: # src/cpu/cpu_table.c
2020-11-18 19:57:10 -03:00
parent 149322a06a f874437009
commit 85a35e0841
8 changed files with 51 additions and 43 deletions
--- a/src/cpu/cpu_table.c
+++ b/src/cpu/cpu_table.c
@@ -1858,5 +1858,5 @@ const cpu_legacy_machine_t cpu_legacy_table[] = {
    {"p6bap",                   cputables_Celeron_Cyrix3},
    {"603tcf",                  cputables_Celeron_Cyrix3},
    {"vpc2007",                 cputables_PentiumIID_Celeron},
-    {NULL, NULL}
+    {NULL, {NULL}}
 };