Merge branch 'master' into topic/c++11

This commit is contained in:
Justin Carpentier
2019-11-10 13:20:05 +01:00
committed by GitHub
2 changed files with 64 additions and 65 deletions

View File

@@ -5,8 +5,6 @@ Open Asset Import Library (assimp)
Copyright (c) 2006-2019, assimp team
All rights reserved.
Redistribution and use of this software in source and binary forms,