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)
commit3c367f924a0c25b5bdc547af375a9da8667fe302
tree602790e6798c5fa3996ba04bdfef06f3c9eeb46c
parent2e12919c4b3017e223980d0c209f60d836202214
parent2442bcf80707234afdd9013348793768f4ae03f2
svn merge ^/trunk/blender -r48604:48638
release/scripts/startup/bl_ui/space_image.py
source/blender/makesrna/intern/rna_userdef.c