Merging r49226 through r49238 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Thu, 26 Jul 2012 09:51:28 +0000 (09:51 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Thu, 26 Jul 2012 09:51:28 +0000 (09:51 +0000)
1  2 
source/blender/blenkernel/BKE_mask.h
source/blender/blenkernel/intern/colortools.c
source/blender/blenkernel/intern/mask.c
source/blender/blenkernel/intern/movieclip.c
source/blender/blenkernel/intern/scene.c
source/blender/editors/space_clip/space_clip.c
source/blender/editors/space_image/image_ops.c
source/blender/imbuf/intern/filter.c

Simple merge
Simple merge