Merge branch 'cmake_adjustments' of https://github.com/Ragora/Torque3D into alpha41/cmake_adjustments

Browse source

# Conflicts:
#	Engine/lib/assimp/INSTALL
#	Engine/source/console/fileSystemFunctions.cpp
#	Tools/CMake/basics.cmake
#	Tools/CMake/modules/module_testing.cmake

...

This commit is contained in:

AzaezelX 2023-05-27 18:18:17 -05:00

parent 0d981b62cf 2f1d21eea6

commit c61439c2f9

5655 changed files with 2646874 additions and 17396 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

1129

Engine/lib/assimp/include/assimp/config.h Normal file

View file

File diff suppressed because it is too large Load diff