RichardTea 6e200cb0d3 Merge branch 'master' into bug-3177-dae-geo-id ... Impossible merge, have discarded upstream		2020-05-04 13:59:09 +01:00
..
AssetLib	Merge branch 'master' into bug-3177-dae-geo-id	2020-05-04 13:59:09 +01:00
CApi	build on Linux with gcc and clang; warning as error only for 'assimp' target	2020-04-27 23:38:33 -07:00
Common	Move format importer and exporter into its won folder.	2020-05-02 15:14:38 +02:00
Material	Merge branch 'master' into kimkulling_dev	2020-03-23 09:00:41 +01:00
PostProcessing	fix type error for template deduction.	2020-04-21 16:39:18 +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	Merge branch 'master' into bug-3177-dae-geo-id	2020-05-04 13:59:09 +01:00