Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@googlemail.com>
Mon, 7 Nov 2016 16:20:27 +0000 (17:20 +0100)
committerKim Kulling <kim.kulling@googlemail.com>
Mon, 7 Nov 2016 16:20:27 +0000 (17:20 +0100)
commit1aafe6287c8c001f7514fa541dac22e0281bec82
tree79c6d2c2f9188d6c6e94d6d9da88fea3da8a92f5
parent8ffd94937e1fc0d8c3365390825f348cd845c812
parenta43634ebd0ddcb1b33d3c7a3210e5a3aa3768a4d
Merge branch 'master' of https://github.com/assimp/assimp