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

2020-12-13 16:55:52 +01:00
parent 901a75bb5d 7a905168e2
commit 4a00adc501
45 changed files with 1023 additions and 762 deletions
--- a/src/video/vid_table.c
+++ b/src/video/vid_table.c
@@ -91,6 +91,8 @@ video_cards[] = {
    { "mda",			&mda_device				},
    { "genius",			&genius_device				},
    { "metheus928_isa",		&s3_metheus_86c928_isa_device		},
+    { "nga",                &nga_device             },
+    { "ogc",        		&ogc_device				},
    { "oti037c",		&oti037c_device				},
    { "oti067",			&oti067_device				},
    { "oti077",			&oti077_device				},
@@ -177,8 +179,6 @@ video_cards[] = {
    { "virge375_vbe20_vlb",	&s3_virge_375_4_vlb_device		},
    { "tgui9400cxi_vlb",	&tgui9400cxi_device			},
    { "tgui9440_vlb",		&tgui9440_vlb_device			},
-    { "ogc",        		&ogc_device				},
-    { "nga",                &nga_device             },
    { "",			NULL                        		}
 };