Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@googlemail.com>
Tue, 6 Sep 2016 13:46:41 +0000 (15:46 +0200)
committerKim Kulling <kim.kulling@googlemail.com>
Tue, 6 Sep 2016 13:46:41 +0000 (15:46 +0200)
commitccf1b368c86a8e661dbf34125d33494bfc36b72d
treec70533fed21f91cd5d462980323d8bed7071a2ff
parentffdca3593bbdd291379321269cd5aa1586add42b
parent0f2cea7ba6d046a02bf3bf8813bb1dfbe73fc253
Merge branch 'master' of https://github.com/assimp/assimp