svn merge ^/trunk/blender -r48333:48370
authorCampbell Barton <ideasman42@gmail.com>
Thu, 28 Jun 2012 11:20:19 +0000 (11:20 +0000)
committerCampbell Barton <ideasman42@gmail.com>
Thu, 28 Jun 2012 11:20:19 +0000 (11:20 +0000)
1  2 
CMakeLists.txt
source/blender/compositor/CMakeLists.txt
source/blender/editors/space_node/drawnode.c
source/blender/imbuf/intern/allocimbuf.c
source/blender/makesrna/intern/rna_nodetree.c

diff --cc CMakeLists.txt
Simple merge