Merging r47581 through r47603 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 8 Jun 2012 09:36:17 +0000 (09:36 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 8 Jun 2012 09:36:17 +0000 (09:36 +0000)
1  2 
release/scripts/startup/bl_ui/space_clip.py
source/blender/blenloader/intern/readfile.c
source/blender/editors/space_clip/tracking_ops.c
source/blender/editors/space_node/drawnode.c
source/blender/makesdna/DNA_node_types.h
source/blender/makesrna/RNA_access.h
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_nodetree_types.h

Simple merge