Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@googlemail.com>
Mon, 27 Feb 2017 19:19:42 +0000 (20:19 +0100)
committerKim Kulling <kim.kulling@googlemail.com>
Mon, 27 Feb 2017 19:19:42 +0000 (20:19 +0100)
commit4d92c01933630e375f2294fbd827eda595f71148
treee73e262dbd4f5a68ca3a6bce984addbac15f410f
parent7a47f1f8f77c59120d6a32e92d39301396364838
parentc3bb2b66ac94d8e75396210268d7f6e82286eaa6
Merge branch 'master' of https://github.com/assimp/assimp