mirror/86Box
1
0
Fork 0
mirror of https://github.com/86Box/86Box.git synced 2026-02-24 20:35:32 -07:00
Code Issues Packages Projects Releases Activity

Merge pull request #16 from 86Box/master

Browse Source 
Merge master
This commit is contained in:
JustinJ553
2021-11-14 19:08:42 +08:00
committed by GitHub
parent 906f856dd0 e24da32acf
commit 79e84b276c
171 changed files with 15602 additions and 5614 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/cpu/cpu_table.c
View File

@@ -186,7 +186,6 @@ const cpu_family_t cpu_families[] = {
{"", 0}
}
},
#if defined(DEV_BRANCH) && defined(USE_M6117)
{
.package = CPU_PKG_M6117,
.manufacturer = "ALi",
@@ -198,7 +197,6 @@ const cpu_family_t cpu_families[] = {
{"", 0}
}
},
#endif
{
.package = CPU_PKG_386SLC_IBM,
.manufacturer = "IBM",