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)
1  2 
source/blender/editors/interface/interface_templates.c
source/blender/editors/space_image/image_ops.c