SimpleTexturedOpenGL/CMakeLists.txt: add path to DEVIL prebuilt library.
FBXParser: fix compiler warning on double -> float.
Bump version number to 3.1
bugfix: fix cmake static linkage option.

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
fixed OgreImporter compilation error with boost scoped_ptr
Merge pull request #294 from treiguts/master

fixed OgreImporter compilation error with boost scoped_ptr
obj loader: added multiline support
collada loaded: bug fixed when importing several files, whith one containing animation
Merge branch 'master' of https://github.com/assimp/assimp
Merge pull request #297 from gjaegy/master

fixed collada import bug + added obj importer '\' newline feature
bugfix: assimp now deals with boost 1.55.

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
workaround: disable config for boost.

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
Drop VC solutions. Fixes #292.
Update doxygen documentation. Drop custom stylesheet.
Assimp_cmd: Drop malformed version spec from rc file.
Assimp can now be built as a subproject in CMake based projects

Signed-off-by: Filip Wasil <filip.wasil@gmail.com>
Merge pull request #299 from filipwasil/builder_fix

Assimp can now be built as a subproject in CMake based projects
ObjExporter: cleanup code. Fix bug writing normal: normals would not be transformed by world transform.
Merge branch 'master' of github.com:assimp/assimp
FBXConverter: avoid creating an empty metadata slot (UDP3DSMAX was erased from list _after_ its size was taken)/
SceneCombiner: implement proper copying of meta data. This entire module will need to be revamped in future as it is highly likely to cause further regressions as assimp data structures are modified.