svn merge ^/trunk/blender -r49186:49190
authorCampbell Barton <ideasman42@gmail.com>
Wed, 25 Jul 2012 09:06:44 +0000 (09:06 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 25 Jul 2012 09:06:44 +0000 (09:06 +0000)
commit7f354402a7724aa0505378c97e320137decb1511
tree963fd8cd6f3d8ce5575359b7712639b5ab061415
parent65f94b8c0b264187a3fb2c129ae662a7e2d26ad6
parent3af938918aae68488fc2fe8388f31ae4c3752b31
svn merge ^/trunk/blender -r49186:49190
source/blender/editors/interface/interface_templates.c
source/blender/editors/space_image/image_ops.c