Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@googlemail.com>
Sat, 17 Jun 2017 19:17:39 +0000 (21:17 +0200)
committerKim Kulling <kim.kulling@googlemail.com>
Sat, 17 Jun 2017 19:17:39 +0000 (21:17 +0200)
commitd3140a68ab12f25ff2e2d5e1e357895441276ea2
tree3b75ffaa5fb7a95026c9d5c314da31b5934ee4a5
parent79818145a72fa7bdbf2dcc73acd9ffc9ec7ee6ff
parentc62429998e4529e7c42500570076430d07fc0894
Merge branch 'master' of https://github.com/assimp/assimp