Kim Kulling 4b0a3305b1 Merge branch 'master' into master		2020-05-17 13:54:10 +02:00
..
AssetLib	Merge branch 'master' into master	2020-05-17 13:54:10 +02:00
CApi	remove step prototype: does not work this way.	2020-05-07 14:00:40 +02:00
Collada	Merge branch 'master' of https://github.com/inhosens/assimp into inhosens-master	2020-05-15 15:08:30 +02:00
Common	Merge branch 'file-formatting' of https://github.com/aaronfranke/assimp into aaronfranke-file-formatting	2020-05-05 10:17:52 +02:00
Material	Merge branch 'master' into kimkulling_dev	2020-03-23 09:00:41 +01:00
PostProcessing	Merge branch 'master' into master	2020-05-06 22:07:39 +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-13 20:24:53 +02:00