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)
commitfed7a2b76b88011fe6e0f395c227eed1e0852d68
tree9e7f20a7515b2ee4ece388b89a07a2aed8f16cdb
parent7d4ee53905d2d0c329c80ce39e9a6f21fa617679
parent2157031dc0ecbe99ef50a8031b44678d69e05740
svn merge ^/trunk/blender -r49241:49244
source/blender/editors/interface/resources.c
source/blender/makesrna/intern/rna_space.c
source/blender/makesrna/intern/rna_userdef.c