Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@googlemail.com>
Sat, 5 Nov 2016 17:41:52 +0000 (18:41 +0100)
committerKim Kulling <kim.kulling@googlemail.com>
Sat, 5 Nov 2016 17:41:52 +0000 (18:41 +0100)
commitcc7b7723c1034854d99cfdcd777966050caf0670
tree52b1960589bb439d2f9d8f2edc591c084e6d297c
parent499886f89e6e05e06e99f9e744c0dd44ecf7581b
parenteaa494ed5528d8eeb7dbed69c5b69eeb60b269cc
Merge branch 'master' of https://github.com/assimp/assimp