Merging r39478 through r39542 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 19 Aug 2011 09:18:07 +0000 (09:18 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 19 Aug 2011 09:18:07 +0000 (09:18 +0000)
1  2 
source/blender/editors/interface/interface_handlers.c
source/blender/editors/interface/interface_intern.h
source/blender/editors/screen/area.c
source/blender/editors/space_sequencer/sequencer_edit.c
source/blender/editors/space_view3d/drawobject.c
source/blender/editors/transform/transform.c

Simple merge