Tamito Kajiyama 4172997675 Merged changes in the trunk up to revision 50607. ... Conflicts resolved: source/blender/blenloader/intern/readfile.c		2012-09-15 00:15:24 +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 50607.	2012-09-15 00:15:24 +00:00
creator.c	Merged changes in the trunk up to revision 50607.	2012-09-15 00:15:24 +00:00