Kim Kulling acd70b35a0 Fix merge issues

2022-01-16 20:57:56 +01:00

..

AssetLib

Fix merge issues

2022-01-16 20:57:56 +01:00

CApi

Update copyrights

2022-01-10 21:13:43 +01:00

Common

Merge branch 'new-file-detection' of https://github.com/krishty/assimp into krishty-new-file-detection

2022-01-16 20:41:24 +01:00

Material

Update copyrights

2022-01-10 21:13:43 +01:00

Pbrt

Update copyrights

2022-01-10 21:13:43 +01:00

PostProcessing

Update copyrights

2022-01-10 21:13:43 +01:00

res

…

.editorconfig

…

CMakeLists.txt

Merge branch 'master' into so-unloading

2022-01-13 20:19:23 +01:00