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)
commitba81b87ea492a86ee1ff18cf906fe964679584eb
tree6bfeac2edb2adb82947166115db648c27f60db52
parent11276bca5ce431981ceded2ef10d4b2acdad88ad
parent92205486e7d773928e1a09283f0e741fc2e9d24a
Merging r48971 through r48980 from trunk into soc-2011-tomato
source/blender/blenkernel/intern/mask.c
source/blender/editors/interface/interface_templates.c