Léo Terziman d28fc25c5c Merge commit 'cc3f8b82f9f6fb4b295a39a3f7ac55154145cc04' into contrib ... Conflicts: CMakeLists.txt		2014-01-17 11:45:57 +01:00
..
assimp	Merge commit 'cc3f8b82f9f6fb4b295a39a3f7ac55154145cc04' into contrib	2014-01-17 11:45:57 +01:00