Merge branch 'master' of https://github.com/assimp/assimp into implementation_warning_fix
authorJared Mulconry <j.mulconry@atomizergames.com>
Sun, 20 Nov 2016 03:08:38 +0000 (14:08 +1100)
committerJared Mulconry <j.mulconry@atomizergames.com>
Sun, 20 Nov 2016 03:08:38 +0000 (14:08 +1100)
commit7d64e4155babb4bb56edd69130d69c82a217be4d
tree5e82ac03e7836dfb15ac04d57e8b26a4fae7f197
parentff31abf57c884d1cbe45b78f3b0b3189102a48ca
parent7ceaca61fd64ccb85423161c09cf8558ad3645f3
Merge branch 'master' of https://github.com/assimp/assimp into implementation_warning_fix