Merging r49300 through r49333 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sat, 28 Jul 2012 18:42:54 +0000 (18:42 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sat, 28 Jul 2012 18:42:54 +0000 (18:42 +0000)
1  2 
build_files/scons/tools/Blender.py
build_files/scons/tools/btools.py
source/blender/blenkernel/intern/mask.c
source/blender/blenkernel/intern/movieclip.c
source/blender/editors/include/ED_clip.h
source/blender/editors/space_clip/clip_editor.c
source/blender/makesdna/DNA_mask_types.h

Simple merge
Simple merge