Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@googlemail.com>
Mon, 26 Sep 2016 18:53:59 +0000 (20:53 +0200)
committerKim Kulling <kim.kulling@googlemail.com>
Mon, 26 Sep 2016 18:53:59 +0000 (20:53 +0200)
commit3245d2d804333db154b4bec969ac0f95f8f4a959
tree62c7eb753f3ab94c87fcf1858099836261a5bc91
parent3aa1bdfd12e25f76bb6f7690398c75e7ec73aebc
parentb6de384936497c06244f63527ea93b9a62647850
Merge branch 'master' of https://github.com/assimp/assimp