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
parent f206249fbf 56e9bce73f
commit 98e7eb476d
16 changed files with 267 additions and 99 deletions
--- a/code/ColladaParser.cpp
+++ b/code/ColladaParser.cpp
@@ -59,7 +59,6 @@ OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

 #include <memory>

-
 using namespace Assimp;
 using namespace Assimp::Collada;
 using namespace Assimp::Formatter;