Commit Graph

1 Commits

Author SHA1 Message Date
Georg Hagen
ea7c6d56f4 Merge branch 'master' into project_setup_refactor
# Conflicts:
#	3rdParty/CMakeLists.txt
#	3rdParty/libarchive/CMakeLists.txt
#	CMakeLists.txt
2024-08-04 18:05:50 +02:00