Kim Kulling 2717d51f7e Merge remote-tracking branch 'origin/master' into opengex_support ... Signed-off-by: Kim Kulling <kim.kulling@googlemail.com> Conflicts: code/ParsingUtils.h		2015-03-17 14:26:39 +01:00
..
CMakeLists.txt	fix linker error: undefined references to openddl_parser.	2015-03-11 19:05:37 +01:00
CompareDump.cpp	Improve error reporting during dump diffing.	2015-03-15 21:01:34 +01:00
Export.cpp	- update license header. Update copyright year and unify naming: our name is 'assimp', not 'ASSIMP'.	2012-02-03 03:38:30 +00:00
ImageExtractor.cpp	Bugfix : Commit not saved changes.	2012-03-20 22:41:39 +00:00
Info.cpp	Avoid division by zero in assimp_cmd info when scene loading succeeds but contains no meshes	2015-01-25 22:30:10 +02:00
Main.cpp	Fixed assimp_cmd version message	2014-05-19 14:56:39 +02:00
Main.h	- unify naming of all header files. Obviously, this is a breaking change that affects all users.	2012-02-03 17:04:06 +00:00
WriteDumb.cpp	fix most warnings with -pendantic	2014-08-18 02:09:06 +02:00
assimp_cmd.rc	Assimp_cmd: Drop malformed version spec from rc file.	2014-06-14 22:47:18 +02:00
generic_inserter.hpp	- Update XML output written by assimp dump. cameras & lights missing, document scheme as well. No guarantees that I won't change it in future without further notice (currently WIP, format to be freezed with our next release).	2010-03-13 00:04:21 +00:00
resource.h	General	2009-03-05 22:32:13 +00:00