Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@googlemail.com>
Tue, 4 Oct 2016 16:41:25 +0000 (18:41 +0200)
committerKim Kulling <kim.kulling@googlemail.com>
Tue, 4 Oct 2016 16:41:25 +0000 (18:41 +0200)
commit8d3184f6fb9263d8a71390ec765354e0c72a788a
tree93560f8792807e3d4e224c6e88529a530efc9837
parent86dc3f7a79d3c7e3490415f23ad64c665371bf1d
parent4533b576f6c0aa880feb83994f977fff14494184
Merge branch 'master' of https://github.com/assimp/assimp