Merge branch '86Box:master' into changeable_icon_set

This commit is contained in:
Laci bá
2021-11-14 21:38:20 +01:00
committed by GitHub
53 changed files with 3736 additions and 976 deletions

View File

@@ -723,7 +723,7 @@ SNDOBJ := sound.o \
snd_wss.o \
snd_ym7128.o
VIDOBJ := video.o \
VIDOBJ := agpgart.o video.o \
vid_table.o \
vid_cga.o vid_cga_comp.o \
vid_compaq_cga.o \