Merge branch 'new_obj_stream_handling' of https://github.com/assimp/assimp into new_o...
authorKim Kulling <kim.kulling@googlemail.com>
Sat, 29 Oct 2016 18:07:53 +0000 (20:07 +0200)
committerKim Kulling <kim.kulling@googlemail.com>
Sat, 29 Oct 2016 18:07:53 +0000 (20:07 +0200)
commit186f3f091f64146a490fd09f8e9985c8ff549d47
tree3ca5476d7710c26ef07bf7646c8d163afc9a6245
parent8bae6ad7b7cba442bc062c50169b55e7331737c8
parent949a27a7438587ee873442b840a1908d9e0a8af4
Merge branch 'new_obj_stream_handling' of https://github.com/assimp/assimp into new_obj_stream_handling