Merging r48971 through r48980 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 16 Jul 2012 17:58:23 +0000 (17:58 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 16 Jul 2012 17:58:23 +0000 (17:58 +0000)
1  2 
source/blender/blenkernel/intern/mask.c
source/blender/editors/interface/interface_templates.c