Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@googlemail.com>
Fri, 15 Jul 2016 09:32:11 +0000 (11:32 +0200)
committerKim Kulling <kim.kulling@googlemail.com>
Fri, 15 Jul 2016 09:32:11 +0000 (11:32 +0200)
commit0fd5f4ac57b4949abdd97374c2df365a4e69c49e
tree76bd8153c822acda52e627f8fd8ee4bcca34fb5a
parent742e513deb6a94690421ef027e279e1afab50476
parent22963ad9e81d80880439ca0559d24c0bad8f6103
Merge branch 'master' of https://github.com/assimp/assimp