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

Browse Source 
# Conflicts:
#	src/machine/machine_table.c
#	src/win/Makefile.mingw
This commit is contained in:
RichardG867
2020-07-06 18:47:50 -03:00
parent 11114c97d2 82f2b203c5
commit c1dd844747
13 changed files with 403 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/include/86box/chipset.h
View File

@@ -60,6 +60,8 @@ extern const device_t slc90e66_device;
extern const device_t ioapic_device;
/* OPTi */
extern const device_t opti283_device;
extern const device_t opti291_device;
extern const device_t opti493_device;
extern const device_t opti495_device;
extern const device_t opti802g_device;