Merge remote-tracking branch 'official/master' into contrib
authorLéo Terziman <leo.terziman@clarte.asso.fr>
Tue, 8 Dec 2015 14:25:13 +0000 (15:25 +0100)
committerLéo Terziman <leo.terziman@clarte.asso.fr>
Tue, 8 Dec 2015 14:25:13 +0000 (15:25 +0100)
commit6eebf8455afa287e7ac7cbdb9f90eea634b43f63
treebc3b7e6e569cd5a2f6e9a097495d56d51bc942ea
parent445ae1fec38e24cb3f73d0e1f92bf7023afc8904
parent0a6788d56ff8b6def164473864b0df6f997d61ad
Merge remote-tracking branch 'official/master' into contrib
code/ColladaParser.cpp
include/assimp/config.h