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

Merge remote-tracking branch 'upstream/master' into version/4.1

Browse Source
This commit is contained in:
Jasmine Iwanek
2023-08-21 23:04:03 -04:00
parent 6a97893cc8 ed675ca9cd
commit e4e4bec9c2
76 changed files with 821 additions and 468 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -560,7 +560,7 @@ extern int machine_at_portableii_init(const machine_t *);
extern int machine_at_portableiii_init(const machine_t *);
extern int machine_at_portableiii386_init(const machine_t *);
extern int machine_at_deskpro386_init(const machine_t *);
extern int machine_at_deskpro386_01_1988_init(const machine_t *);
extern int machine_at_deskpro386_05_1988_init(const machine_t *);
/* m_at_socket4.c */
extern void machine_at_premiere_common_init(const machine_t *, int);