From: Jared Mulconry <j.mulconry@atomizergames.com>
Date: Sun, 20 Nov 2016 03:08:38 +0000 (+1100)
Subject: Merge branch 'master' of https://github.com/assimp/assimp into implementation_warning_fix
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=7d64e4155babb4bb56edd69130d69c82a217be4d;p=platform%2Fupstream%2Fassimp.git

Merge branch 'master' of https://github.com/assimp/assimp into implementation_warning_fix
---

7d64e4155babb4bb56edd69130d69c82a217be4d