Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@googlemail.com>
Sun, 3 Jan 2016 19:00:28 +0000 (20:00 +0100)
committerKim Kulling <kim.kulling@googlemail.com>
Sun, 3 Jan 2016 19:00:28 +0000 (20:00 +0100)
commitd26187714d561c16befbb6adf5105174ecab4e95
treef8122c7bcb432d814a34a02513ee967a4999be83
parent540c9f3e9f3e925da293e6b383caf9d3edd0cfca
parent51bdc6c9bf59593ee3cd5107b337b101b7083c33
Merge branch 'master' of https://github.com/assimp/assimp