Merging r49239 through r49241 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 26 Jul 2012 10:06:56 +0000 (10:06 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 26 Jul 2012 10:06:56 +0000 (10:06 +0000)
1  2 
release/scripts/startup/bl_ui/space_image.py
source/blender/editors/space_clip/space_clip.c
source/blender/editors/space_image/space_image.c
source/blender/makesdna/DNA_space_types.h