svn merge ^/trunk/blender -r49241:49244
authorCampbell Barton <ideasman42@gmail.com>
Thu, 26 Jul 2012 10:55:07 +0000 (10:55 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 26 Jul 2012 10:55:07 +0000 (10:55 +0000)
1  2 
source/blender/editors/interface/resources.c
source/blender/makesrna/intern/rna_space.c
source/blender/makesrna/intern/rna_userdef.c