Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@googlemail.com>
Fri, 21 Oct 2016 17:43:56 +0000 (19:43 +0200)
committerKim Kulling <kim.kulling@googlemail.com>
Fri, 21 Oct 2016 17:43:56 +0000 (19:43 +0200)
commit50803b897c65c71150c4c7027fb8908ebd879c6c
treef50c1b5ce919e19ef984caac1754345f273fdf50
parentbac28061ea2d9e3625a8928674573e4628ab91af
parent3b61ff4cf230bc78c5e6527b6c24524bed6591a0
Merge branch 'master' of https://github.com/assimp/assimp