abma 8c45a4dc3b Merge remote-tracking branch 'origin' ... Conflicts: code/C4DImporter.cpp code/OgreImporter.h		2015-04-16 01:03:00 +02:00
..
assimp_cmd	Merge remote-tracking branch 'origin'	2015-04-16 01:03:00 +02:00
assimp_view	Define CMAKE_DEBUG_POSTFIX and use it instead of ASSIMP_DEBUG_PREFIX	2015-01-23 14:19:29 -05:00
shared	Fresh icon for assimp_cmd on Windows.	2010-03-04 18:34:40 +00:00