Tamito Kajiyama 8135cc9f95 Merged changes in the trunk up to revision 47700. ... Conflicts resolved: source/blender/blenkernel/BKE_main.h source/blender/blenkernel/CMakeLists.txt source/blender/blenkernel/intern/library.c source/blender/blenloader/intern/readfile.c source/blender/blenloader/intern/writefile.c source/blender/editors/interface/resources.c source/blender/makesdna/DNA_ID.h source/blender/makesdna/DNA_action_types.h source/blender/makesdna/intern/makesdna.c source/blender/makesrna/SConscript source/blender/makesrna/intern/rna_internal.h source/blender/makesrna/intern/rna_main.c source/blender/makesrna/intern/rna_main_api.c source/blender/windowmanager/WM_types.h		2012-06-10 20:50:43 +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 47700.	2012-06-10 20:50:43 +00:00
creator.c	Merged changes in the trunk up to revision 47381.	2012-06-03 21:11:10 +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