Merging r49622 through r49623 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 6 Aug 2012 15:22:19 +0000 (15:22 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 6 Aug 2012 15:22:19 +0000 (15:22 +0000)
commit24fc0287f3692a4dd49b583adb040817f7180d14
tree0d81bd745677e78cbda4e35c08d29b49002cb50c
parente2203d548e0f53f994af40a7a59a66a39d67c6d1
parenta334b5a4b6bee306ba014aa5f9df608de0259735
Merging r49622 through r49623 from trunk into soc-2011-tomato
source/blender/makesdna/DNA_mask_types.h