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

Browse Source

# Conflicts:
#	src/include/86box/machine.h
#	src/machine/m_at_socket7.c
#	src/machine/machine_table.c
#	src/video/vid_tgui9440.c
#	src/win/win.c

...

This commit is contained in:

RichardG867

2021-11-14 13:45:37 -03:00

parent 3fa3541f10 dc912436e2

commit 0de137daf7

172 changed files with 16726 additions and 5703 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

982

src/win/86Box.rc

File diff suppressed because it is too large Load Diff