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)
commit7d4ee53905d2d0c329c80ce39e9a6f21fa617679
treeafb1196e0666fdb9c5ab87bab0288026c12f592e
parent075e1180a393e4a6f3fdf8b211890ac7679fbfdc
parent25469dfb6d92cc0374fa45f1a4daf4a56670fdc2
Merging r49239 through r49241 from trunk into soc-2011-tomato
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