Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@goolemail.com>
Fri, 9 Jun 2017 18:24:31 +0000 (20:24 +0200)
committerKim Kulling <kim.kulling@goolemail.com>
Fri, 9 Jun 2017 18:24:31 +0000 (20:24 +0200)
commit6329a0e62b2d8cb0ae953d2cc8afd01dea498e71
tree37949e569f5f0ed997e6d8fdcb2115ef5604552f
parentad74bfc260d19762556ef9e9d59b86ede0e1cc0f
parentfae5a0e71a31f9e56aa701383a985da7e4f0fecd
Merge branch 'master' of https://github.com/assimp/assimp