Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@googlemail.com>
Fri, 22 Jul 2016 19:16:34 +0000 (21:16 +0200)
committerKim Kulling <kim.kulling@googlemail.com>
Fri, 22 Jul 2016 19:16:34 +0000 (21:16 +0200)
commit86b7f12c18613b0dc44e101f1552e4985827bb7a
tree765209c7b167f0f3db017793007e4d7c18bedb4f
parentbfed4ea6344fb3ec3a46cdc901c1d179a8e4de8f
parent8c2e6d66a8e02cd1dfb5a56626c38d5ade574eb1
Merge branch 'master' of https://github.com/assimp/assimp