Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@googlemail.com>
Fri, 29 Sep 2017 19:59:11 +0000 (21:59 +0200)
committerKim Kulling <kim.kulling@googlemail.com>
Fri, 29 Sep 2017 19:59:11 +0000 (21:59 +0200)
commit5adc029225d9786306780ee0f4273bbcc36261aa
tree7102fd01e76cf199760aaa38a6ccb53b1d8dd6be
parentc42589460d94d0e6334fbb6791309bd1218f5913
parent6ae35fb4d10456d3f18930547c2d0ffec7458ccc
Merge branch 'master' of https://github.com/assimp/assimp