Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@googlemail.com>
Thu, 27 Jul 2017 18:49:54 +0000 (20:49 +0200)
committerKim Kulling <kim.kulling@googlemail.com>
Thu, 27 Jul 2017 18:49:54 +0000 (20:49 +0200)
commitd052b74b96105fd81c62f5f0f0ae3a9974283eea
tree5406e7d3ca9a8835c0780a12dc79315531d391be
parenta2bbf76cf4628d1ffd21b34654cd088b8c43ce1b
parent4b860dfc42e68c0098c0b5b348b3189c10c977c6
Merge branch 'master' of https://github.com/assimp/assimp