Merging r41140 through r41157 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 20 Oct 2011 20:24:04 +0000 (20:24 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 20 Oct 2011 20:24:04 +0000 (20:24 +0000)
1  2 
source/blender/blenkernel/intern/depsgraph.c
source/blender/blenloader/intern/readblenentry.c
source/blender/editors/interface/interface_draw.c
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_templates.c
source/blender/imbuf/intern/indexer.c
source/blender/windowmanager/intern/wm_operators.c

Simple merge