svn merge ^/trunk/blender -r48868:48888
authorCampbell Barton <ideasman42@gmail.com>
Fri, 13 Jul 2012 12:06:31 +0000 (12:06 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Fri, 13 Jul 2012 12:06:31 +0000 (12:06 +0000)
1  2 
source/blender/blenkernel/BKE_mask.h
source/blender/blenkernel/intern/mask.c
source/blender/compositor/operations/COM_MaskOperation.cpp
source/creator/CMakeLists.txt

Simple merge
Simple merge