Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@googlemail.com>
Sat, 22 Oct 2016 20:15:00 +0000 (22:15 +0200)
committerKim Kulling <kim.kulling@googlemail.com>
Sat, 22 Oct 2016 20:15:00 +0000 (22:15 +0200)
commit54c5acd02dcfeaba596713b32419f266aa6c5829
tree1a5fea62e5f7d4dccacac06a1af06b1334e5cfbe
parent79504c08d9f70af37315c6e35f0304c6c22405b5
parent1724cc9e66cb4cf7a8ae7d6dcec2e3dad79d1f26
Merge branch 'master' of https://github.com/assimp/assimp