claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
# Conflicts:
#	src/include/86box/machine.h
#	src/machine/m_at_socket7.c
#	src/machine/machine_table.c
#	src/video/vid_tgui9440.c
#	src/win/win.c
This commit is contained in:
RichardG867
2021-11-14 13:45:37 -03:00
parent 3fa3541f10 dc912436e2
commit 0de137daf7
172 changed files with 16726 additions and 5703 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/machine/m_at_socket370.c
View File

@@ -102,7 +102,7 @@ machine_at_s1857_init(const machine_t *model)
device_add(&i440bx_device);
device_add(&piix4e_device);
device_add(&keyboard_ps2_ami_pci_device);
device_add(&w83977f_370_device);
device_add(&w83977ef_370_device);
device_add(&intel_flash_bxt_device);
if (sound_card_current == SOUND_INTERNAL) {