Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@googlemail.com>
Thu, 10 Nov 2016 20:40:05 +0000 (21:40 +0100)
committerKim Kulling <kim.kulling@googlemail.com>
Thu, 10 Nov 2016 20:40:05 +0000 (21:40 +0100)
commit7a578aae4652978986e99ced8648f52b9b614a97
tree5c45c9a593d63c1c2f15aa85068e5651b8089df3
parentc5d6ac2c30cca7fbb8e51c4e3636f483c20d7366
parent1126f8dadeef0a5f1111aad07fa045be70059d76
Merge branch 'master' of https://github.com/assimp/assimp