Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@goolemail.com>
Mon, 8 May 2017 19:29:07 +0000 (21:29 +0200)
committerKim Kulling <kim.kulling@goolemail.com>
Mon, 8 May 2017 19:29:07 +0000 (21:29 +0200)
commit65653edf8882050deed47c988d9dc4e11f1b9680
treeb6b64ef8c49ff50fbf184c340e8775dfb2b1089a
parent5289954e27675220b89ee2f725fd478170413e11
parent98100d8cab09a6d793271dbb95438dd6a9ecaef3
Merge branch 'master' of https://github.com/assimp/assimp