Merge pull request #1676 from 86Box/master

Bring the branch up to par with master.
2021-09-08 00:08:23 +02:00
parent 901c274119 e9615fc167
commit c5864a46d8
26 changed files with 1576 additions and 196 deletions
--- a/src/include/86box/video.h
+++ b/src/include/86box/video.h
@@ -250,6 +250,9 @@ extern const device_t compaq_cga_2_device;
 extern const device_t ogc_device;
 extern const device_t ogc_m24_device;

+/* Chips & Technologies 82C425 */
+extern const device_t f82c425_video_device;
+
 /* NCR NGA */
 extern const device_t nga_device;