Merging r44227 through r45619 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sat, 14 Apr 2012 10:46:47 +0000 (10:46 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sat, 14 Apr 2012 10:46:47 +0000 (10:46 +0000)
commitbfca79a6577c7e4ab3d0dcae585abcf2a17fe710
tree00804e29d009c81406892159233d372aee12e500
parent69ee17f0b6121ab63f0a7712c9563295eda88d39
parent9a79bd38ade00fc663c27ffda9892629ef5ca755
Merging r44227 through r45619 from trunk into soc-2011-tomato
release/scripts/startup/bl_ui/space_clip.py
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_clip/clip_draw.c
source/blender/editors/space_clip/clip_editor.c
source/blender/editors/space_clip/space_clip.c
source/blender/makesdna/DNA_space_types.h
source/blender/makesrna/intern/rna_space.c