Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@googlemail.com>
Thu, 20 Oct 2016 14:43:38 +0000 (16:43 +0200)
committerKim Kulling <kim.kulling@googlemail.com>
Thu, 20 Oct 2016 14:43:38 +0000 (16:43 +0200)
commit6a31e3528e86ed9018d937eca604ca6d0d6148b1
treef5ed3508145cc0016b2cec276bbf736fc8b23add
parent91e833056e7c8896caa8082e05ea1a669b953389
parentb0f09ee6e2d1386ad1c524478019e9efae888da7
Merge branch 'master' of https://github.com/assimp/assimp