Merging r48238 through r48240 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sun, 24 Jun 2012 15:31:40 +0000 (15:31 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sun, 24 Jun 2012 15:31:40 +0000 (15:31 +0000)
commit1e76a587ff75b44932fb842a07422a3b38071879
tree76b994bee6f33e7af8d59a1673f675838df6fe7c
parentca24daea64f1f0378d7a25e7d3d3d25022ece41d
parent09e31a41bf2cfa6af910f8d468f2f323c90ac752
Merging r48238 through r48240 from trunk into soc-2011-tomato
source/blender/makesrna/intern/rna_nodetree_types.h