Merge branch 'master' of https://github.com/assimp/assimp
authorKim Kulling <kim.kulling@googlemail.com>
Wed, 25 May 2016 22:41:48 +0000 (00:41 +0200)
committerKim Kulling <kim.kulling@googlemail.com>
Wed, 25 May 2016 22:41:48 +0000 (00:41 +0200)
commit4e982c0538675b3129b8443c6bafd0d52524ed12
treedb53043f0afa7d515068dc4d3f3f8f0e64a08211
parent2cbbc3da09870659721df3c33e3e51d67b0837c1
parent0f1a625be71a460aa2c9b45cb71301d29e3a118c
Merge branch 'master' of https://github.com/assimp/assimp
code/OpenGEXImporter.cpp