Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@googlemail.com>
Sat, 5 Aug 2017 16:46:56 +0000 (18:46 +0200)
committerKim Kulling <kim.kulling@googlemail.com>
Sat, 5 Aug 2017 16:46:56 +0000 (18:46 +0200)
commit1a2c69fda881065e8452a0ee4de3b09fb70e2450
treed75b6a129bd4bd43b748e13edf77c09ce4a01178
parentc3cd7349d0afc3aede84a90f0f45f7993f029329
parent8091e46e81441f0dcb7e789c36d9727da786135c
Merge branch 'master' of https://github.com/assimp/assimp