Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@googlemail.com>
Thu, 10 Nov 2016 15:26:57 +0000 (16:26 +0100)
committerKim Kulling <kim.kulling@googlemail.com>
Thu, 10 Nov 2016 15:26:57 +0000 (16:26 +0100)
commit1126f8dadeef0a5f1111aad07fa045be70059d76
treed9dcdb42f8ab50cdb6fb66b7d7dccfe956592eab
parent1c5030c642cda0a10b0f2e674ecd8b2881f590e2
parentb04069b441074f625b5813e5315f857744a738df
Merge branch 'master' of https://github.com/assimp/assimp