Merge branch 'temp' into temp

2020-03-23 16:06:32 -06:00
parent 169bd9bdab d3b2d1b5e4
commit c007121062
19 changed files with 455 additions and 82 deletions
--- a/src/cpu_common/cpu.h
+++ b/src/cpu_common/cpu.h
@@ -157,6 +157,7 @@ extern CPU  cpus_Cyrix3[];
 #if defined(DEV_BRANCH) && defined(USE_I686)
 extern CPU	cpus_PentiumPro[];
 extern CPU	cpus_PentiumII[];
+extern CPU	cpus_PGA370[];
 #endif