svn merge ^/trunk/blender -r48604:48638
authorCampbell Barton <ideasman42@gmail.com>
Thu, 5 Jul 2012 11:40:48 +0000 (11:40 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 5 Jul 2012 11:40:48 +0000 (11:40 +0000)
1  2 
release/scripts/startup/bl_ui/space_image.py
source/blender/makesrna/intern/rna_userdef.c