Merging r39251 through r39311 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 11 Aug 2011 18:16:29 +0000 (18:16 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 11 Aug 2011 18:16:29 +0000 (18:16 +0000)
Splash screen is kept to be tomatoes.

1  2 
build_files/scons/config/darwin-config.py
build_files/scons/tools/btools.py
source/blender/editors/gpencil/gpencil_paint.c
source/blender/editors/interface/interface_templates.c
source/blender/editors/space_view3d/drawobject.c
source/blender/windowmanager/WM_api.h
source/blender/windowmanager/WM_types.h
source/blender/windowmanager/intern/wm_operators.c
source/blenderplayer/bad_level_call_stubs/stubs.c

Simple merge
Simple merge