Léo Terziman 7c3a039349 Merge remote-tracking branch 'official/master' into contrib ... Conflicts: include/assimp/matrix4x4.inl include/assimp/vector2.h include/assimp/vector3.h		2014-04-22 14:32:59 +02:00
..
assimp	Merge remote-tracking branch 'official/master' into contrib	2014-04-22 14:32:59 +02:00