Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@googlemail.com>
Thu, 22 Sep 2016 07:52:56 +0000 (09:52 +0200)
committerKim Kulling <kim.kulling@googlemail.com>
Thu, 22 Sep 2016 07:52:56 +0000 (09:52 +0200)
commitd005b38f99f75bc5ebd8f0bf730433b391a29662
tree96784a2d216a468b4a36fe7af6d48d4646ef17d9
parent1e7af6f24a1b4dc217b1aef5a3772d0351a5de71
parent38cbdcd885096a9e6b8782fcf4ecca7c82c91289
Merge branch 'master' of https://github.com/assimp/assimp