Merge branch 'master' into gltf_o3dgc
authorAlexandr Arutjunov <smal.root@gmail.com>
Sat, 10 Sep 2016 06:14:28 +0000 (09:14 +0300)
committerAlexandr Arutjunov <smal.root@gmail.com>
Sat, 10 Sep 2016 06:14:28 +0000 (09:14 +0300)
commit5fe32caa6d6b1fe4e291ed8c335c6482363b0459
tree8e753c5d5f99156ca0b53017544c37b4f3bedc01
parentd97f00571e207dc3a117f549179f47533de43f9b
Merge branch 'master' into gltf_o3dgc
code/CMakeLists.txt
code/D3MFImporter.cpp