Kim Kulling 1607c8e6e0 Fix merge issue		2020-07-27 11:18:46 +02:00
..
AssetLib	Merge branch 'master' into iamAdrianIusca-master	2020-07-24 11:35:02 +02:00
CApi	replace NULL and avoid ai_assert with more than 2 tests.	2020-06-23 21:05:42 +02:00
Common	Fix merge issue	2020-07-27 11:18:46 +02:00
Material	replace NULL and avoid ai_assert with more than 2 tests.	2020-06-23 21:05:42 +02:00
PostProcessing	fix merge	2020-07-07 17:16:53 +02:00
res	Updated copyright dates.	2020-01-20 08:53:12 -05:00
.editorconfig	Implemented: Add editor config for source code	2015-06-28 15:50:57 -06:00
CMakeLists.txt	Fix two deletions.	2020-07-20 18:42:57 +02:00