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)
1  2 
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