Tamito Kajiyama a5152b7ca0 Merged changes in the trunk up to revision 46787. ... Conflicts resolved: source/blender/blenkernel/intern/idcode.c source/blender/blenloader/intern/readfile.c source/blender/editors/include/ED_anim_api.h source/blender/editors/include/UI_resources.h source/blender/makesrna/intern/rna_main.c		2012-05-19 08:40:56 +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 46787.	2012-05-19 08:40:56 +00:00
creator.c	Merged changes in the trunk up to revision 46787.	2012-05-19 08:40:56 +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