Merging r47572 through r47580 form trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 7 Jun 2012 18:08:57 +0000 (18:08 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 7 Jun 2012 18:08:57 +0000 (18:08 +0000)
commit93870181225bb303ee725a22863323a60f3711c6
treecb5b0c0e1897fc00f07d3660333869107105add6
parent2b2d1439dc3c31d21113bdae3a87cfb249a6bc96
parentfd271f34fe10b020336c32547f2b75d6dd7de14e
Merging r47572 through r47580 form trunk into soc-2011-tomato
source/blender/blenkernel/intern/movieclip.c
source/blender/blenloader/intern/readfile.c
source/blender/blenloader/intern/writefile.c
source/blender/editors/space_clip/clip_draw.c
source/blender/editors/space_clip/tracking_ops.c
source/blender/editors/transform/transform_conversions.c