Merge branch 'master' of git://github.com/assimp/assimp
authorOtger <otgerrogla@gmail.com>
Sun, 29 Nov 2015 20:17:05 +0000 (21:17 +0100)
committerOtger <otgerrogla@gmail.com>
Sun, 29 Nov 2015 20:17:05 +0000 (21:17 +0100)
commitc5cb7f7b73ec6ab2ad0c6a8ffb38bc9427515c6d
tree5a02bca6d967b8e92430cba7d20d60e10c2276b4
parentf2c49a69baca657e963e3abd314f7f300fb90cc3
parent714630cc1169982906448cd689d11f0a061d6adc
Merge branch 'master' of git://github.com/assimp/assimp