Merge branch 'master'

Browse Source

# Conflicts:
#	sources/machine_info.cpp

...

This commit is contained in:

Simon De Backer

2020-08-13 22:56:40 +02:00

parent d5b7414b36 34259a4749

commit 5ca7ff177b

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