Tamito Kajiyama b7cd9ec3ad Merged changes in the trunk up to revision 52340. ... Conflicts resolved: source/blender/blenloader/intern/readfile.c		2012-11-19 00:41:11 +00:00
..
buildinfo.c	style cleanup: mostly whitespace in rna	2012-05-12 11:01:29 +00:00
CMakeLists.txt	Merged changes in the trunk up to revision 52340.	2012-11-19 00:41:11 +00:00
creator.c	Merged changes in the trunk up to revision 52340.	2012-11-19 00:41:11 +00:00