claunia/86Box
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of ssh://github.com/86Box/86Box into cleanup30

Browse Source 
# Conflicts:
#	src/qt/qt_mediamenu.cpp
#	src/qt/qt_mediamenu.hpp
This commit is contained in:
RichardG867
2022-06-07 15:36:12 -03:00
parent 0582c11e90 92c3768a48
commit 50b75c457d
104 changed files with 7259 additions and 357 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/win/Makefile.mingw
View File

@@ -689,6 +689,7 @@ VIDOBJ := agpgart.o video.o \
vid_wy700.o \
vid_ega.o vid_ega_render.o \
vid_svga.o vid_svga_render.o \
vid_8514a.o \
vid_ddc.o \
vid_vga.o \
vid_ati_eeprom.o \