Kim Kulling 77b705048b fix merge issues. 5 lat temu
..
AMFImporter.cpp 839986ca14 next step of AMF-Migration. 5 lat temu
AMFImporter.hpp 839986ca14 next step of AMF-Migration. 5 lat temu
AMFImporter_Geometry.cpp 839986ca14 next step of AMF-Migration. 5 lat temu
AMFImporter_Macro.hpp 4e16716924 Merge branch 'file-formatting' of https://github.com/aaronfranke/assimp into aaronfranke-file-formatting 5 lat temu
AMFImporter_Material.cpp fb20e15163 start to migrate colladat and amf 5 lat temu
AMFImporter_Node.hpp fb20e15163 start to migrate colladat and amf 5 lat temu
AMFImporter_Postprocess.cpp 77b705048b fix merge issues. 5 lat temu