Merge branch 'master' into coverity_scan
authorKim Kulling <kim.kulling@googlemail.com>
Mon, 21 Nov 2016 17:57:56 +0000 (18:57 +0100)
committerKim Kulling <kim.kulling@googlemail.com>
Mon, 21 Nov 2016 17:57:56 +0000 (18:57 +0100)
commite50ac81b65900e5bb3e87ea6b51fb70b04959242
treedd61a3377ea46494feae0fe8828032b7f43b5993
parentf51cd4c6d47a28aee56a04a3778be3fcc5e96f12
parent8a9deeb4a0dcbdfb419c19d34e510df6db39cfd6
Merge branch 'master' into coverity_scan
.travis.yml
code/BlenderLoader.cpp