Merge branch 'master_nc' into merge-upstream-0.8.3

Browse Source

# Conflicts:
#	.github/workflows/Linux-pack.yml
#	CMakeLists.txt

...

This commit is contained in:

Yuriy Puchkov

2020-10-02 14:24:05 +03:00

parent 8e92ea5ab4 46fa3de069

commit 2bc84e91f3

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