Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@googlemail.com>
Sun, 6 Dec 2015 11:20:11 +0000 (12:20 +0100)
committerKim Kulling <kim.kulling@googlemail.com>
Sun, 6 Dec 2015 11:20:11 +0000 (12:20 +0100)
commit99b51eb4566dceb5e568b3107126b00ddc373cc1
tree77dd5847d462a65871aaceddbfaa18ee74e6f891
parent6641188a8edefcf52bb702a700ef56df78044f57
parenta972397196d7b97c71f840d8c6aa49d19a84a213
Merge branch 'master' of https://github.com/assimp/assimp