Merge branch 'coverity_scan' of https://github.com/assimp/assimp into coverity_scan
authorKim Kulling <kim.kulling@googlemail.com>
Mon, 21 Nov 2016 18:09:22 +0000 (19:09 +0100)
committerKim Kulling <kim.kulling@googlemail.com>
Mon, 21 Nov 2016 18:09:22 +0000 (19:09 +0100)
1  2 
.travis.yml

diff --cc .travis.yml
Simple merge