Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@googlemail.com>
Sun, 5 Feb 2017 18:30:11 +0000 (19:30 +0100)
committerKim Kulling <kim.kulling@googlemail.com>
Sun, 5 Feb 2017 18:30:11 +0000 (19:30 +0100)
commit6ed1f7570e3306b312e0cf506ad82c825e5d1413
tree6f39c2e90b61c8f54d9e9a014e9f9ecf7d3f8e86
parent31bb9f7ba69bed854e78347f1dbb4978491c5f4d
parent11e2ca173d1269eec4371149291aa827aa25f361
Merge branch 'master' of https://github.com/assimp/assimp
code/ObjExporter.h
include/assimp/Importer.hpp
test/models/OBJ/spider.obj
test/unit/utObjImportExport.cpp