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

2021-02-07 00:24:21 +01:00
parent b7e2e239e8 fbfde99b4a
commit f026ac6eea
28 changed files with 1176 additions and 851 deletions
--- a/src/include/86box/chipset.h
+++ b/src/include/86box/chipset.h
@@ -146,6 +146,5 @@ extern const device_t	wd76c10_device;
 /* Miscellaneous Hardware */
 extern const device_t   phoenix_486_jumper_device;
 extern const device_t	vpc2007_device;
-extern const device_t   olivetti_m290_registers_device;

 #endif	/*EMU_CHIPSET_H*/