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

This commit is contained in:
EngiNerd89
2021-02-11 20:10:43 +01:00
25 changed files with 257 additions and 90 deletions

View File

@@ -110,14 +110,12 @@ extern const device_t sis_5571_device;
#endif
/* ST */
#if defined(DEV_BRANCH) && defined(USE_STPC)
extern const device_t stpc_client_device;
extern const device_t stpc_consumer2_device;
extern const device_t stpc_elite_device;
extern const device_t stpc_atlas_device;
extern const device_t stpc_serial_device;
extern const device_t stpc_lpt_device;
#endif
/* VIA */
extern const device_t via_vt82c49x_device;