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

Browse Source

# Conflicts:
#	CMakeLists.txt
#	src/include_make/86box/version.h

...

This commit is contained in:

OBattler

2022-02-18 17:53:05 +01:00

parent 0a71f19213 351db812e0

commit efb79217f2

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

Diff Content Not Available