Merging r46096 through r46110 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 30 Apr 2012 12:09:25 +0000 (12:09 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 30 Apr 2012 12:09:25 +0000 (12:09 +0000)
1  2 
source/blender/blenloader/intern/readfile.c
source/blender/makesrna/intern/rna_userdef.c
source/creator/CMakeLists.txt

Simple merge