Léo Terziman 6c0ebb679a Merge commit '87a0e7703258576f1a7e4ba763b961da70c1cd91' into contrib ... Conflicts: code/ColladaExporter.cpp		2014-01-17 11:19:29 +01:00
..
assimp	Merge commit '87a0e7703258576f1a7e4ba763b961da70c1cd91' into contrib	2014-01-17 11:19:29 +01:00