Tamito Kajiyama 68ae82bb47 Merged changes in the trunk up to revision 43585. ... Conflicts resolved: source/blender/editors/include/UI_resources.h source/blender/editors/interface/resources.c source/blender/makesrna/intern/rna_scene.c		2012-01-21 23:01:25 +00:00
..
bad_level_call_stubs	Merged changes in the trunk up to revision 43585.	2012-01-21 23:01:25 +00:00
CMakeLists.txt	Corrected fix for linking issues with blenderplayer enabled	2012-01-16 18:49:10 +00:00