Jared Mulconry 98e7eb476d Merge branch 'master' of https://github.com/assimp/assimp into implementation_warning_fix ...

# Conflicts:
#	code/ObjFileImporter.cpp

2016-11-27 13:00:33 +11:00

..

headercheck

Refactor: Apply editor config settings to CMake files and generated sources

2015-06-28 16:08:06 -06:00

models

[+] Few models for AMF and X3D.

2016-10-06 17:44:54 +03:00

models-nonbsd

[+] Few models for AMF and X3D.

2016-10-06 17:44:54 +03:00

other

Add first WIP version of a TrueSpace loader. Currently only ASCII COB/SCNs are supported.

2010-04-02 04:17:05 +00:00

regression

Merge branch 'master' into coverity_scan

2016-09-02 10:25:36 +02:00

unit

Merge branch 'master' of https://github.com/assimp/assimp into implementation_warning_fix

2016-11-27 13:00:33 +11:00

.editorconfig

Implemented: Add editor config for test code

2015-06-28 16:08:06 -06:00

CMakeLists.txt

closes https://github.com/assimp/assimp/issues/1076: use ai_assert instead

2016-11-24 21:15:07 +01:00