svn merge ^/trunk/blender -r49601:49620
authorCampbell Barton <ideasman42@gmail.com>
Mon, 6 Aug 2012 14:02:03 +0000 (14:02 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 6 Aug 2012 14:02:03 +0000 (14:02 +0000)
1  2 
release/scripts/startup/bl_ui/space_image.py
source/blender/editors/space_image/space_image.c
source/blender/makesrna/intern/rna_space.c