Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@googlemail.com>
Fri, 9 Sep 2016 18:42:36 +0000 (20:42 +0200)
committerKim Kulling <kim.kulling@googlemail.com>
Fri, 9 Sep 2016 18:42:36 +0000 (20:42 +0200)
commit95676b4db9938fdf1a5d6af593de8f7dbf2bed29
tree527498414c59ef631c7de955200c6abb6852721e
parent05fce9a008ace2331310ddc6e06eddc5f6943fdd
parentf336f30335ec87952b57dc4db43c2fa16c6842dd
Merge branch 'master' of https://github.com/assimp/assimp