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

Browse Source

# Conflicts:
#	src/scsi/scsi_cdrom.c
#	src/scsi/scsi_ncr5380.c
#	src/scsi/scsi_spock.c

...

This commit is contained in:

TC1995

2023-01-08 14:22:52 +01:00

parent c4ce53c91f 43acec9630

commit d109e794e3

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