Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@slm-solutions.com>
Thu, 1 Jun 2017 14:22:25 +0000 (16:22 +0200)
committerKim Kulling <kim.kulling@slm-solutions.com>
Thu, 1 Jun 2017 14:22:25 +0000 (16:22 +0200)
commit9d69a1253294fb78ac78deffaaed8d712f4eab37
tree23484ad983eb548a6bb025de64d1ab6591b1da28
parentb20a8e551f7e2097cd1c2656084377bcc582a5a4
parent0a35fa0aef8d984cd464029e482951aee2f195fa
Merge branch 'master' of https://github.com/assimp/assimp
tools/assimp_view/assimp_view.cpp