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

.editorconfig

@@ -0,0 +1,17 @@
+# See <http://EditorConfig.org> for details
+
+root = true
+
+[CMakeLists.txt,*.cmake{,.in}]
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_size = 2
+indent_style = space
+
+[*.h.in]
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_size = 4
+indent_style = space

.gitignore

@@ -1,3 +1,4 @@
+.idea
 build
 .project
 *.kdev4*

code/.editorconfig

@@ -0,0 +1,8 @@
+# See <http://EditorConfig.org> for details
+
+[*.{h,hpp,c,cpp}]
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_size = 4
+indent_style = space

code/B3DImporter.h

@@ -1,4 +1,3 @@
-
 /*
 Open Asset Import Library (assimp)
 ----------------------------------------------------------------------

code/BaseImporter.cpp

@@ -611,7 +611,3 @@ void BatchLoader::LoadAll()
         DefaultLogger::get()->info("%%% END EXTERNAL FILE %%%");
     }
 }
-
-
-
-

code/ColladaExporter.cpp

@@ -1089,4 +1089,3 @@ void ColladaExporter::WriteNode(aiNode* pNode)
 
 #endif
 #endif
-

code/assbin_chunks.h

@@ -1,4 +1,3 @@
-
 #ifndef INCLUDED_ASSBIN_CHUNKS_H
 #define INCLUDED_ASSBIN_CHUNKS_H
 

include/assimp/.editorconfig

@@ -0,0 +1,8 @@
+# See <http://EditorConfig.org> for details
+
+[*.{h,hpp,inl}]
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_size = 4
+indent_style = space

include/assimp/Exporter.hpp

@@ -502,4 +502,3 @@ inline aiReturn Exporter :: Export( const aiScene* pScene, const std::string& pF
 } // namespace Assimp
 #endif // ASSIMP_BUILD_NO_EXPORT
 #endif // AI_EXPORT_HPP_INC
-

test/.editorconfig

@@ -0,0 +1,8 @@
+# See <http://EditorConfig.org> for details
+
+[*.{h,hpp,c,cpp}]
+end_of_line = lf
+insert_final_newline = true
+trim_trailing_whitespace = true
+indent_size = 4
+indent_style = space

test/CMakeLists.txt

@@ -63,4 +63,3 @@ target_link_libraries( unit assimp
 )
 endif(AddGTest_FOUND)
 add_subdirectory(headercheck)
-