Merging r49659 through r49666 from trunk into soc-2011-tomato
authorSergey Sharybin <sergey.vfx@gmail.com>
Tue, 7 Aug 2012 16:48:43 +0000 (16:48 +0000)
committerSergey Sharybin <sergey.vfx@gmail.com>
Tue, 7 Aug 2012 16:48:43 +0000 (16:48 +0000)
1  2 
release/scripts/startup/bl_ui/space_node.py
source/blender/editors/space_node/node_intern.h
source/blender/imbuf/IMB_imbuf.h

Simple merge