svn merge ^/trunk/blender -r49890:49917
authorCampbell Barton <ideasman42@gmail.com>
Wed, 15 Aug 2012 10:36:31 +0000 (10:36 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 15 Aug 2012 10:36:31 +0000 (10:36 +0000)
1  2 
CMakeLists.txt
release/scripts/startup/bl_ui/space_node.py
source/blender/editors/interface/interface_templates.c
source/blender/editors/render/render_internal.c
source/blender/editors/space_node/drawnode.c
source/blender/makesdna/DNA_node_types.h
source/blender/makesrna/intern/rna_nodetree.c
source/blender/windowmanager/intern/wm_init_exit.c

diff --cc CMakeLists.txt
Simple merge