Merging r47677 through r47683 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Sun, 10 Jun 2012 16:09:03 +0000 (16:09 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Sun, 10 Jun 2012 16:09:03 +0000 (16:09 +0000)
1  2 
source/blender/makesrna/RNA_access.h

Simple merge