Merging r47507 through r47534 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Wed, 6 Jun 2012 19:11:06 +0000 (19:11 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Wed, 6 Jun 2012 19:11:06 +0000 (19:11 +0000)
commit286c5915b35f3008030cd89899be0d714bd30ada
tree8ae11c6876a26ec92bc7262e6fd5ab55ce5cd100
parent870ba8aa13c87fdeb1724d0f3ad7b7a4b53a4d32
parentf43a733f591377f2cdce0555443dba003c05fd30
Merging r47507 through r47534 from trunk into soc-2011-tomato
release/scripts/startup/bl_ui/space_clip.py
source/blender/blenkernel/intern/movieclip.c
source/blender/blenkernel/intern/tracking.c
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_clip/clip_draw.c
source/blender/editors/space_clip/space_clip.c
source/blender/editors/space_clip/tracking_ops.c
source/blender/editors/transform/transform.c
source/blender/editors/transform/transform_conversions.c
source/blender/makesrna/intern/rna_movieclip.c