Merging r47612 through r47623 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Fri, 8 Jun 2012 18:25:01 +0000 (18:25 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Fri, 8 Jun 2012 18:25:01 +0000 (18:25 +0000)
1  2 
source/blender/blenkernel/BKE_node.h
source/blender/blenkernel/BKE_tracking.h
source/blender/blenkernel/intern/movieclip.c
source/blender/blenkernel/intern/node.c
source/blender/blenkernel/intern/tracking.c
source/blender/editors/space_clip/clip_dopesheet_ops.c
source/blender/makesdna/DNA_space_types.h
source/blender/makesrna/intern/rna_nodetree_types.h
source/blender/makesrna/intern/rna_space.c
source/blender/makesrna/intern/rna_tracking.c
source/blender/nodes/CMakeLists.txt

Simple merge
Simple merge