svn merge ^/trunk/blender -r46612:46629
authorCampbell Barton <ideasman42@gmail.com>
Mon, 14 May 2012 13:55:12 +0000 (13:55 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Mon, 14 May 2012 13:55:12 +0000 (13:55 +0000)
commit060282ea4207b08b4b24df5fc0d496e01ba5d865
tree9e81b10580d5c178656f2e29e40369634dfdceb5
parente9d520f482561cba0fe01ffa44b5f6eb97ee0276
parentff26474a46fc9a064d01711ec7f80111dca8d347
svn merge ^/trunk/blender -r46612:46629
source/blender/editors/include/ED_clip.h
source/blender/editors/space_api/spacetypes.c
source/blender/editors/space_clip/clip_editor.c
source/blender/editors/space_clip/space_clip.c
source/blender/editors/space_clip/tracking_ops.c