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)

Trivial merge