Kim Kulling aaa19903c6 Fix merge conflicts

2022-06-11 18:50:18 +02:00

..

AssetLib

Fix merge conflicts

2022-06-11 18:50:18 +02:00

CApi

Update copyrights

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

Common

Merge branch 'master' into kimkulling/create_skeleton_data_issue_4015

2022-06-02 21:47:29 +02:00

Material

Update copyrights

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

Pbrt

Add compiler switgxh for using static linkage for std_image

2022-05-31 23:24:31 +02:00

PostProcessing

Fix compier warning

2022-05-14 09:59:07 +02:00

res

Resource script updates

2022-04-30 08:01:15 -07:00

.editorconfig

Implemented: Add editor config for source code

2015-06-28 15:50:57 -06:00

CMakeLists.txt

Update comment

2022-06-01 12:45:40 +02:00