Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@googlemail.com>
Thu, 31 Dec 2015 18:49:37 +0000 (19:49 +0100)
committerKim Kulling <kim.kulling@googlemail.com>
Thu, 31 Dec 2015 18:49:37 +0000 (19:49 +0100)
commit912cf63b71c58b7fa850caa7c5c862d4f804897c
treea8c5a5ca27d6095a6e4b41a481577e76033b55c7
parent4e9ee4e406f3d11a690817db660ac881e116123f
parente02a7cdb3cda83efbf7d0711257665026cd7bccf
Merge branch 'master' of https://github.com/assimp/assimp