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)
commite2203d548e0f53f994af40a7a59a66a39d67c6d1
treef985af23ef4bf55b62ed5d1be173795b516b50c5
parent385c38f6ed13b3d9502644f6912517ea4314630e
parentb282b5275c919b95e9947801b21678341ec21bba
svn merge ^/trunk/blender -r49601:49620
release/scripts/startup/bl_ui/space_image.py
source/blender/editors/space_image/space_image.c
source/blender/makesrna/intern/rna_space.c