Merge branch 'master' of https://github.com/assimp/assimp into export_x3d
authorAlexandr Arutjunov <smal.root@gmail.com>
Mon, 3 Oct 2016 16:14:11 +0000 (19:14 +0300)
committerAlexandr Arutjunov <smal.root@gmail.com>
Mon, 3 Oct 2016 16:14:11 +0000 (19:14 +0300)

Trivial merge