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

2022-02-03 22:31:22 +02:00
parent 038082e2dc ffc548a8fa
commit 33f2a16921
6 changed files with 483 additions and 171 deletions
--- a/src/include/86box/video.h
+++ b/src/include/86box/video.h
@@ -318,7 +318,8 @@ extern const device_t im1024_device;
 extern const device_t pgc_device;

 #if defined(DEV_BRANCH) && defined(USE_MGA)
-/* Matrox Mystique */
+/* Matrox MGA */
+extern const device_t millennium_device;
 extern const device_t mystique_device;
 extern const device_t mystique_220_device;
 #endif