svn merge ^/trunk/blender -r48585:48604
authorCampbell Barton <ideasman42@gmail.com>
Wed, 4 Jul 2012 17:55:30 +0000 (17:55 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Wed, 4 Jul 2012 17:55:30 +0000 (17:55 +0000)
1  2 
CMakeLists.txt
source/blender/compositor/CMakeLists.txt
source/blender/compositor/intern/COM_Converter.cpp
source/blender/makesdna/DNA_node_types.h
source/blender/makesrna/intern/rna_nodetree.c
source/blender/makesrna/intern/rna_scene.c
source/blender/makesrna/intern/rna_space.c
source/blender/makesrna/intern/rna_userdef.c
source/blender/makesrna/intern/rna_wm.c

diff --cc CMakeLists.txt
Simple merge