Merge remote-tracking branch 'github/master' into contrib
No related branches found
No related tags found
Showing
- .gitignore 2 additions, 0 deletions.gitignore
- .travis.sh 56 additions, 7 deletions.travis.sh
- .travis.yml 32 additions, 16 deletions.travis.yml
- CMakeLists.txt 63 additions, 19 deletionsCMakeLists.txt
- CREDITS 8 additions, 0 deletionsCREDITS
- Readme.md 6 additions, 4 deletionsReadme.md
- appveyor.yml 43 additions, 22 deletionsappveyor.yml
- assimp.pc.in 1 addition, 1 deletionassimp.pc.in
- cmake-modules/CoverallsGenerateGcov.cmake 2 additions, 2 deletionscmake-modules/CoverallsGenerateGcov.cmake
- code/3DSConverter.cpp 6 additions, 3 deletionscode/3DSConverter.cpp
- code/3DSExporter.cpp 7 additions, 2 deletionscode/3DSExporter.cpp
- code/3DSExporter.h 7 additions, 10 deletionscode/3DSExporter.h
- code/3DSHelper.h 9 additions, 7 deletionscode/3DSHelper.h
- code/3DSLoader.cpp 1 addition, 1 deletioncode/3DSLoader.cpp
- code/3MFXmlTags.h 89 additions, 0 deletionscode/3MFXmlTags.h
- code/AMFImporter.hpp 2 additions, 2 deletionscode/AMFImporter.hpp
- code/AMFImporter_Node.hpp 1 addition, 1 deletioncode/AMFImporter_Node.hpp
- code/AMFImporter_Postprocess.cpp 6 additions, 4 deletionscode/AMFImporter_Postprocess.cpp
- code/ASELoader.cpp 1 addition, 0 deletionscode/ASELoader.cpp
- code/AssbinExporter.cpp 17 additions, 5 deletionscode/AssbinExporter.cpp
Loading
Please register or sign in to comment