Merge branch 'master' of github.com:assimp/assimp into appveyor
authorJared Mulconry <jaredmulconry@gmail.com>
Wed, 11 Oct 2017 08:06:29 +0000 (19:06 +1100)
committerJared Mulconry <jaredmulconry@gmail.com>
Wed, 11 Oct 2017 08:06:29 +0000 (19:06 +1100)
commit3e7dbb5dfba905288bc03c636a9a8348cbe6085b
tree36b5b1f618ce20a6819d9e7d0819aeca3140b67b
parentfa91a0f64c16f9f2afcf6b631302bf918527e2f7
parentc3074a81ca9c0ad03c9a7dd2f32fc729a45dc5db
Merge branch 'master' of github.com:assimp/assimp into appveyor