Merging r50113 through r50118 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 22 Aug 2012 13:46:23 +0000 (13:46 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 22 Aug 2012 13:46:23 +0000 (13:46 +0000)
1  2 
source/blender/blenkernel/intern/sequencer.c
source/blender/editors/space_image/space_image.c
source/blender/editors/space_node/node_intern.h
source/blender/makesrna/intern/rna_scene.c