svn merge ^/trunk/blender -r46629:46632
authorCampbell Barton <ideasman42@gmail.com>
Mon, 14 May 2012 14:55:10 +0000 (14:55 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 14 May 2012 14:55:10 +0000 (14:55 +0000)
commita32f572f892a1140ed84d0681d67da07d477cad9
tree2ad72594d3e83236ab03e2789e653c414cfb4a5c
parent060282ea4207b08b4b24df5fc0d496e01ba5d865
parent24fb2bad55f5fa741d3b5d1df27750a4b7d80eff
svn merge ^/trunk/blender -r46629:46632
source/blender/editors/space_clip/space_clip.c