Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@googlemail.com>
Mon, 9 Jan 2017 19:01:45 +0000 (20:01 +0100)
committerKim Kulling <kim.kulling@googlemail.com>
Mon, 9 Jan 2017 19:01:45 +0000 (20:01 +0100)
commit60c593611e25366e36599bf172794b9f919a24c8
tree9af1ef429be6fd06fa3c83c57b14f642a27bd3c9
parent2b4f16d2d250b5f40e2d9b0331b27ee455931c86
parent685c737051fe74b9ed8ad41df9849e6b60b2d25f
Merge branch 'master' of https://github.com/assimp/assimp