Merging r45620 through r45692 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Mon, 16 Apr 2012 12:47:34 +0000 (12:47 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Mon, 16 Apr 2012 12:47:34 +0000 (12:47 +0000)
1  2 
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_clip/tracking_ops.c
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_space.c
source/blender/makesrna/intern/rna_tracking.c
source/blender/makesrna/intern/rna_userdef.c

Simple merge