fix: pre-compiled header conflicts across different build configurations
Merge branch 'master' of https://github.com/tszirr/assimp
update : add initial code convention file.

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
Added name member to Collada::Mesh.
Added parsing of Collada mesh names.
Added loading of mesh name from Collada mesh to aiMesh struct.
Collada mesh name is copied from id only if there was no name attribute in the <geometry> node.
Merge branch 'master' of https://github.com/assimp/assimp
Merge pull request #78 from sherief/master

Fix for Collada mesh naming bug
bugfix : fix compiler warning.

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
Merge branch 'master' of https://github.com/assimp/assimp
bugfix : fix pedantic vs2012 warnings.

Signed-off-by: Kim Kulling <kim.kulling@googlemail.com>
Improve STL representation detection

Previously, the STL loader relied on a string check at the start of the
buffer to determine if the STL file was of ASCII representation.  This led to
certain false-positives for binary STL files with the magic string present in
their header.  This patch addresses the issue by adding a proper binary check
to the representation detection.
Merge pull request #79 from jdduke/stl_binary_check

Improve STL representation detection
Fix Android compilation with STLport

Satisfy STLport's runtime_error constructor with an explicit string argument.
Merge pull request #81 from jdduke/android_fix

Fix Android compilation with STLport
Update Readme.md
add missing <sstream> header to lexical_cast replacement
fix error "Chunk is too large" with gcc >=4.7.0 / mingw64
Merge pull request #83 from abma/master

fix .3DS error "Chunk is too large" with gcc >=4.7.0 / mingw