Merge branch 'master' of https://github.com/assimp/assimp into gltf_o3dgc
authorAlexandr Arutjunov <smal.root@gmail.com>
Sat, 10 Sep 2016 06:05:36 +0000 (09:05 +0300)
committerAlexandr Arutjunov <smal.root@gmail.com>
Sat, 10 Sep 2016 06:05:36 +0000 (09:05 +0300)
commitac1bcaa4cc5a6c836480e6563c79f11ee1d9c994
treeaafb265f721b5668255de03dd78c72fb6d85841b
parentd49ad6c93ee1eaf4cbce3fc49320f70516c724c0
parentf336f30335ec87952b57dc4db43c2fa16c6842dd
Merge branch 'master' of https://github.com/assimp/assimp into gltf_o3dgc
code/glTFAsset.inl
code/glTFAssetWriter.inl
code/glTFExporter.cpp
code/glTFImporter.cpp