Merge branch 'master' into project_setup_refactor

Browse Source

# Conflicts:
#	3rdParty/CMakeLists.txt
#	3rdParty/libarchive/CMakeLists.txt
#	CMakeLists.txt

...

This commit is contained in:

Georg Hagen

2024-08-04 18:05:50 +02:00

parent db367db7bb a4ce79f17a

commit ea7c6d56f4

70 changed files with 1096 additions and 274 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

0

tests/placeholder.cpp Normal file