svn merge ^/trunk/blender -r46966:46979
authorCampbell Barton <ideasman42@gmail.com>
Thu, 24 May 2012 16:37:40 +0000 (16:37 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 24 May 2012 16:37:40 +0000 (16:37 +0000)
commit25b677787fcef7a02fdfa4f45b923e25bc28fccd
treebeed2f36910dc719049b68de862b0e3144ec319b
parentebd39522d89a6f5d1b5ae58342cb1a3b28ebd714
parentda710b3e14e75db10f336009a9d32c187c632042
svn merge ^/trunk/blender -r46966:46979
source/blender/editors/space_clip/tracking_ops.c