Tamito Kajiyama 1f7ae143a2 Merged changes in the trunk up to revision 48227. ... Conflicts resolved: source/blender/blenloader/intern/readfile.c source/blender/editors/space_file/filelist.c		2012-06-24 10:29:26 +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 48227.	2012-06-24 10:29:26 +00:00
creator.c	Merged changes in the trunk up to revision 48227.	2012-06-24 10:29:26 +00:00
SConscript	Shuffle some build code around to ensure debug builds on Windows actually run too.	2011-06-08 11:53:07 +00:00